[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115303: (Mostly) fix bug #16007 with generation of
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] trunk r115303: (Mostly) fix bug #16007 with generation of MULE-*.map files. |
Date: |
Sat, 30 Nov 2013 10:43:13 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115303
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16007
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2013-11-30 12:42:17 +0200
message:
(Mostly) fix bug #16007 with generation of MULE-*.map files.
admin/charsets/mule-charsets.el: Rewritten to work in Emacs 23 and
later.
modified:
admin/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-2226
admin/charsets/mule-charsets.el
mulecharsets.el-20091113204419-o5vbwnq5f7feedwu-8374
=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog 2013-11-30 02:06:34 +0000
+++ b/admin/ChangeLog 2013-11-30 10:42:17 +0000
@@ -1,3 +1,8 @@
+2013-11-30 Eli Zaretskii <address@hidden>
+
+ * charsets/mule-charsets.el: Rewritten to work in Emacs 23 and
+ later. (Bug#16007)
+
2013-11-30 Glenn Morris <address@hidden>
Stop keeping (most) generated cedet grammar files in the repository.
=== modified file 'admin/charsets/mule-charsets.el'
--- a/admin/charsets/mule-charsets.el 2012-08-28 16:08:50 +0000
+++ b/admin/charsets/mule-charsets.el 2013-11-30 10:42:17 +0000
@@ -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)))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115303: (Mostly) fix bug #16007 with generation of MULE-*.map files.,
Eli Zaretskii <=