1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00

(Mostly) fix bug #16007 with generation of MULE-*.map files.

admin/charsets/mule-charsets.el: Rewritten to work in Emacs 23 and
 later.
This commit is contained in:
Eli Zaretskii 2013-11-30 12:42:17 +02:00
parent 10634b405c
commit 28c9be2d34
2 changed files with 34 additions and 15 deletions

View file

@ -1,3 +1,8 @@
2013-11-30 Eli Zaretskii <eliz@gnu.org>
* charsets/mule-charsets.el: Rewritten to work in Emacs 23 and
later. (Bug#16007)
2013-11-30 Glenn Morris <rgm@gnu.org>
Stop keeping (most) generated cedet grammar files in the repository.

View file

@ -19,20 +19,32 @@
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
(if (not (or (and (= emacs-major-version 21) (= emacs-minor-version 4))
(= emacs-major-version 22)))
(error "Use Emacs of version 21.4 or any of version 22"))
;; For the record: the old, pre-v23 code was this:
;; (if (not (or (and (= emacs-major-version 21) (= emacs-minor-version 4))
;; (= emacs-major-version 22)))
;; (error "Use Emacs of version 21.4 or any of version 22"))
;;
;; (defun func (start end)
;; (while (<= start end)
;; (let ((split (split-char start))
;; (unicode (encode-char start 'ucs)))
;; (if unicode
;; (if (nth 2 split)
;; (insert (format "0x%02X%02X 0x%04X\n"
;; (nth 1 split) (nth 2 split) unicode))
;; (insert (format "0x%02X 0x%04X\n" (nth 1 split) unicode)))))
;; (setq start (1+ start))))
(defun func (start end)
(while (<= start end)
(let ((split (split-char start))
(unicode (encode-char start 'ucs)))
(if unicode
(if (nth 2 split)
(insert (format "0x%02X%02X 0x%04X\n"
(nth 1 split) (nth 2 split) unicode))
(insert (format "0x%02X 0x%04X\n" (nth 1 split) unicode)))))
(setq start (1+ start))))
(defun func (range charset)
(let ((start (car range))
(end (cdr range)))
(while (and (<= start end) (<= start #x10ffff))
(let ((ch (encode-char start charset)))
(if ch
(if (> ch 256)
(insert (format "0x%04X 0x%04X\n" ch start))
(insert (format "0x%02X 0x%04X\n" ch start)))))
(setq start (1+ start)))))
(defconst charset-alist
'(("MULE-ethiopic.map" . ethiopic)
@ -51,6 +63,8 @@
(dolist (elt charset-alist)
(with-temp-buffer
(insert header)
(map-charset-chars 'func (cdr elt))
(write-file (car elt))))
(map-charset-chars 'func (cdr elt) (cdr elt))
(sort-lines nil (point-min) (point-max))
(let ((coding-system-for-write 'unix))
(write-file (car elt)))))