# HG changeset patch
# User Aidan Kehoe <kehoea@parhasard.net>
# Date 1233423551 0
# Node ID dbe504bac1f4b8d48b078b83c3572baf57e6dd08
# Parent  b25f081370e0ea07648c447823f1b97e3d45b33b# Parent  c83cab5a4f04d9f2c7f94946c6fbbaa9749961f6
Merge.

diff -r b25f081370e0 -r dbe504bac1f4 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jan 31 13:21:37 2009 +0000
+++ b/lisp/ChangeLog	Sat Jan 31 17:39:11 2009 +0000
@@ -1,3 +1,10 @@
+2009-01-31  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* mule/mule-cmds.el (finish-set-language-environment): 
+	Treat control characters specially in the
+	invalid-sequence-coding-system handling, display them using the
+	caret notation. 
+
 2009-01-31  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* frame.el (display-graphic-p): 
diff -r b25f081370e0 -r dbe504bac1f4 lisp/mule/mule-cmds.el
--- a/lisp/mule/mule-cmds.el	Sat Jan 31 13:21:37 2009 +0000
+++ b/lisp/mule/mule-cmds.el	Sat Jan 31 17:39:11 2009 +0000
@@ -771,17 +771,18 @@
   (let ((invalid-sequence-coding-system
          (get-language-info language-name 'invalid-sequence-coding-system))
         (disp-table (specifier-instance current-display-table))
-        glyph)
+        glyph string)
     (when (consp invalid-sequence-coding-system)
       (setq invalid-sequence-coding-system
             (car invalid-sequence-coding-system)))
     (map-char-table
      #'(lambda (key entry)
-         (setq glyph (make-glyph
-                      (vector
-                       'string :data
-                       (decode-coding-string (string entry)
-                                             invalid-sequence-coding-system))))
+         (setq string (decode-coding-string (string entry)
+                                            invalid-sequence-coding-system))
+         ;; Treat control characters specially:
+         (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)
          nil)