(set-display-table-and-terminal-coding-system): If the coding

system specified in `unibyte-display' property is different from
the arg coding-system, don't setup standard-display-table.

2 files changed, 10 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9061ec433a4..c62577f4e40 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-07  Kenichi Handa  <handa@m17n.org>
+
+        * international/mule-cmds.el
+        (set-display-table-and-terminal-coding-system): If the coding
+        system specified in `unibyte-display' property is different from
+        the arg coding-system, don't setup standard-display-table.
+
 2005-12-06  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/edebug.el (edebug-skip-whitespace): read1:lread.c says
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 57791409fdd..7756aa58ccd 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1798,7 +1798,9 @@ The default status is as follows:
 (defun set-display-table-and-terminal-coding-system (language-name &optional coding-system)
   "Set up the display table and terminal coding system for LANGUAGE-NAME."
   (let ((coding (get-language-info language-name 'unibyte-display)))
-    (if coding
+    (if (and coding
+             (or (not coding-system)
+                 (coding-system-equal coding coding-system)))
         (standard-display-european-internal)
       ;; The following 2 lines undo the 8-bit display that we set up
       ;; in standard-display-european-internal, which see.  This is in