[COMMIT] Correct a test failure uncovered by the last commit.
APPROVE COMMIT
NOTE: This patch has been committed.
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1234878156 0
# Node ID 127dbf03e1af1acd6796b7e66bc35b6628d91886
# Parent 4dc42d1fe6845c6a072021ade8eb0f326543e17a
Correct a test failure uncovered by the last commit.
lisp/ChangeLog addition:
2009-02-17 Aidan Kehoe <kehoea(a)parhasard.net>
* mule/mule-cmds.el (finish-set-language-environment):
Correct this function, don't try to format non-control characters
with ^ followed by their value plus (char-int ?＠).
diff -r 4dc42d1fe684 -r 127dbf03e1af lisp/ChangeLog
--- a/lisp/ChangeLog Tue Feb 17 13:39:25 2009 +0000
+++ b/lisp/ChangeLog Tue Feb 17 13:42:36 2009 +0000
＠＠ -1,3 +1,9 ＠＠
+2009-02-17 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * mule/mule-cmds.el (finish-set-language-environment):
+ Correct this function, don't try to format non-control characters
+ with ^ followed by their value plus (char-int ?＠).
+
2009-02-17 Aidan Kehoe <kehoea(a)parhasard.net>
* unicode.el (unicode-query-coding-region):
diff -r 4dc42d1fe684 -r 127dbf03e1af lisp/mule/mule-cmds.el
--- a/lisp/mule/mule-cmds.el Tue Feb 17 13:39:25 2009 +0000
+++ b/lisp/mule/mule-cmds.el Tue Feb 17 13:42:36 2009 +0000
＠＠ -780,14 +780,16 ＠＠
(setq string (decode-coding-string (string entry)
invalid-sequence-coding-system))
(when (= 1 (length string))
+ ;; Treat Unicode error sequence chars as the octets
+ ;; corresponding to those on disk:
+ (setq unicode-error-lookup
+ (get-char-table (aref string 0)
+ unicode-error-default-translation-table))
+ (when unicode-error-lookup
+ (setq string (format "%c" unicode-error-lookup)))
;; Treat control characters specially:
- (cond
- ((string-match "^[\x00-\x1f\x80-\x9f]$" string)
- (setq string (format "^%c" (+ ?＠ (aref string 0)))))
- ((setq unicode-error-lookup
- (get-char-table (aref string 0)
- unicode-error-default-translation-table))
- (setq string (format "^%c" (+ ?＠ unicode-error-lookup))))))
+ (when (string-match "^[\x00-\x1f\x80-\x9f]$" string)
+ (setq string (format "^%c" (+ ?＠ (aref string 0))))))
(setq glyph (make-glyph (vector 'string :data string)))
(set-glyph-face glyph 'unicode-invalid-sequence-warning-face)
(put-char-table key glyph disp-table)
--
¿Dónde estará ahora mi sobrino Yoghurtu Nghe, que tuvo que huir
precipitadamente de la aldea por culpa de la escasez de rinocerontes?
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches