From 735b7c87d4ac54fd56c876a013d0052c899a4afa Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Wed, 7 Dec 2005 07:28:37 +0000 Subject: [PATCH] (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. --- lisp/ChangeLog | 7 +++++++ lisp/international/mule-cmds.el | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) 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 + + * 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 * 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 -- 2.39.2