changeset: 4662:127dbf03e1af1acd6796b7e66bc35b6628d91886 user: Aidan Kehoe <kehoea(a)parhasard.net&gt; date: Tue Feb 17 13:42:36 2009 +0000 files: lisp/ChangeLog lisp/mule/mule-cmds.el description: Correct a test failure uncovered by the last commit. lisp/ChangeLog addition: 2009-02-17 Aidan Kehoe <kehoea(a)parhasard.net&gt; * 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 4dc42d1fe6845c6a072021ade8eb0f326543e17a -r 127dbf03e1af1acd6796b7e66bc35b6628d91886 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＠parhasa +2009-02-17 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * 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&gt; * unicode.el (unicode-query-coding-region): diff -r 4dc42d1fe6845c6a072021ade8eb0f326543e17a -r 127dbf03e1af1acd6796b7e66bc35b6628d91886 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 ＠＠ the language environment for the major l (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) _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches