From 166ce29fb6ea1ce6c869db85108cdac5905862d4 Mon Sep 17 00:00:00 2001 From: Dave Love Date: Thu, 19 Dec 2002 12:52:51 +0000 Subject: [PATCH] (standard-keyboard-coding-systems): Deleted. (set-locale-environment): Don't use it. --- lisp/international/mule-cmds.el | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 04269014ca0..62a4cd676d7 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -2121,14 +2121,6 @@ the language name that would otherwise be used for this locale.") The first element whose locale regexp matches the start of a downcased locale specifies the coding system to prefer when using that locale.") -(defconst standard-keyboard-coding-systems - (purecopy - '(iso-latin-1 iso-latin-2 iso-latin-3 iso-latin-4 iso-latin-5 - iso-latin-6 iso-latin-7 iso-latin-8 iso-latin-9 koi8-u koi8-r)) - "Coding systems that are commonly used for keyboards. -`set-locale-environment' will set the `keyboard-coding-system' if the -coding-system specified by the locale setting is a member of this list.") - (defun locale-name-match (key alist) "Search for KEY in ALIST, which should be a list of regexp-value pairs. Return the value corresponding to the first regexp that matches the @@ -2236,12 +2228,14 @@ See also `locale-charset-language-names', `locale-language-names', (when default-enable-multibyte-characters (set-display-table-and-terminal-coding-system language-name)) - ;; Set the `keyboard-coding-system' if appropriate. - (let ((kcs (or coding-system - (car (get-language-info language-name - 'coding-system))))) - (if (memq kcs standard-keyboard-coding-systems) - (set-keyboard-coding-system kcs))) + ;; Set the `keyboard-coding-system' if appropriate (tty + ;; only). At least X and MS Windows can generate + ;; multilingual input. + (unless window-system + (let ((kcs (or coding-system + (car (get-language-info language-name + 'coding-system))))) + (if kcs (set-keyboard-coding-system kcs)))) (setq locale-coding-system (car (get-language-info language-name 'coding-priority)))) -- 2.39.2