# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1133940448 0
# Node ID 9fa16adb2f520fd6e149141e14c64f1774a92f2f
# Parent  ad09fcb8cef50c53a391ac4ed7597d14ed84f2d9
(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.

diff -r ad09fcb8cef5 -r 9fa16adb2f52 lisp/international/mule-cmds.el
--- a/lisp/international/mule-cmds.el	Tue Dec 06 22:10:07 2005 +0000
+++ b/lisp/international/mule-cmds.el	Wed Dec 07 07:27:28 2005 +0000
@@ -1798,7 +1798,9 @@
 (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