From 28c9be2d34709a7d575e4bd4e26956bc3b2a0b8c Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 30 Nov 2013 12:42:17 +0200 Subject: [PATCH] (Mostly) fix bug #16007 with generation of MULE-*.map files. admin/charsets/mule-charsets.el: Rewritten to work in Emacs 23 and later. --- admin/ChangeLog | 5 ++++ admin/charsets/mule-charsets.el | 46 +++++++++++++++++++++------------ 2 files changed, 35 insertions(+), 16 deletions(-) diff --git a/admin/ChangeLog b/admin/ChangeLog index d70056f001e..f65596a1015 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,8 @@ +2013-11-30 Eli Zaretskii + + * charsets/mule-charsets.el: Rewritten to work in Emacs 23 and + later. (Bug#16007) + 2013-11-30 Glenn Morris Stop keeping (most) generated cedet grammar files in the repository. diff --git a/admin/charsets/mule-charsets.el b/admin/charsets/mule-charsets.el index 4a48d994b1b..4ccf4bfb5be 100644 --- a/admin/charsets/mule-charsets.el +++ b/admin/charsets/mule-charsets.el @@ -19,20 +19,32 @@ ;; along with GNU Emacs. If not, see . -(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)))) +;; 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 (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))))) -- 2.39.2