Fix handling of 8-bit characters in a display table.

3 files changed, 36 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b48b39d7657..d61a8c565a8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-31  Kenichi Handa  <handa@m17n.org>
+
+        * international/mule-cmds.el (standard-display-european-internal):
+        Setup standard-display-table for 8-bit characters by storing 8-bit
+        characters in the element vector.
+
+        * disp-table.el (standard-display-8bit): Setup
+        standard-display-table for 8-bit characters by storing 8-bit
+        characters in the element vector.
+        (standard-display-european): Likewise.
+
 2010-08-26  Michael Albinus  <michael.albinus@gmx.de>
 
         Sync with Tramp 2.1.19.
diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index 286c8f319ff..86aed277765 100644
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -109,11 +109,27 @@ Valid symbols are `truncation', `wrap', `escape', `control',
 
 ;;;###autoload
 (defun standard-display-8bit (l h)
-  "Display characters in the range L to H literally."
+  "Display characters representing raw bytes in the range L to H literally.
+
+On a terminal display, each character in the range is displayed
+by sending the corresponding byte directly to the terminal.
+
+On a graphic display, each character in the range is displayed
+using the default font by a glyph whose code is the corresponding
+byte.
+
+Note that ASCII printable characters (SPC to TILDA) are displayed
+in the default way after this call."
   (or standard-display-table
       (setq standard-display-table (make-display-table)))
+  (if (> h 255)
+      (setq h 255))
   (while (<= l h)
-    (aset standard-display-table l (if (or (< l ?\s) (>= l 127)) (vector l)))
+    (if (< l 128)
+        (aset standard-display-table l
+              (if (or (< l ?\s) (= l 127)) (vector l)))
+      (let ((c (unibyte-char-to-multibyte l)))
+        (aset standard-display-table c (vector c))))
     (setq l (1+ l))))
 
 ;;;###autoload
@@ -235,9 +251,12 @@ in `.emacs'."
           (and (null arg)
                (char-table-p standard-display-table)
                ;; Test 161, because 160 displays as a space.
-               (equal (aref standard-display-table 161) [161])))
+               (equal (aref standard-display-table
+                            (unibyte-char-to-multibyte 161))
+                      (vector (unibyte-char-to-multibyte 161)))))
       (progn
-        (standard-display-default 160 255)
+        (standard-display-default
+         (unibyte-char-to-multibyte 160) (unibyte-char-to-multibyte 255))
         (unless (or (memq window-system '(x w32 ns)))
           (and (terminal-coding-system)
                (set-terminal-coding-system nil))))
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 008a59531fc..871bab20013 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1953,7 +1953,7 @@ See `set-language-info-alist' for use in programs."
                      (> (aref (number-to-string (nth 2 (x-server-version))) 0)
                         ?3))
           ;; Make non-line-break space display as a plain space.
-          (aset standard-display-table 160 [32]))
+          (aset standard-display-table (unibyte-char-to-multibyte 160) [32]))
         ;; Most Windows programs send out apostrophes as \222.  Most X fonts
         ;; don't contain a character at that position.  Map it to the ASCII
         ;; apostrophe.  [This is actually RIGHT SINGLE QUOTATION MARK,
@@ -1961,7 +1961,7 @@ See `set-language-info-alist' for use in programs."
         ;; fonts probably have the appropriate glyph at this position,
         ;; so they could use standard-display-8bit.  It's better to use a
         ;; proper windows-1252 coding system.  --fx]
-        (aset standard-display-table 146 [39]))))
+        (aset standard-display-table (unibyte-char-to-multibyte 146) [39]))))
 
 (defun set-language-environment-coding-systems (language-name)
   "Do various coding system setups for language environment LANGUAGE-NAME."