# HG changeset patch # User Stefan Monnier # Date 1006046962 0 # Node ID 0ca8b0f41ebdcd6f0226b00e7313588c0b4b2b91 # Parent 3d601db163611558e36ff569f790fc2f00bab663 (locale-name-match): Use \` and \(?:. (standard-keyboard-coding-systems): New var. (set-locale-environment): Use it to decide whether or not to call set-keyboard-coding-system. diff -r 3d601db16361 -r 0ca8b0f41ebd lisp/international/mule-cmds.el --- a/lisp/international/mule-cmds.el Sat Nov 17 22:51:11 2001 +0000 +++ b/lisp/international/mule-cmds.el Sun Nov 18 01:29:22 2001 +0000 @@ -1881,13 +1881,21 @@ 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)) + "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 start of KEY, or nil if there is no match." (let (element) (while (and alist (not element)) - (if (string-match (concat "^\\(" (car (car alist)) "\\)") key) + (if (string-match (concat "\\`\\(?:" (car (car alist)) "\\)") key) (setq element (car alist))) (setq alist (cdr alist))) (cdr element))) @@ -1988,6 +1996,13 @@ (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))) + (setq locale-coding-system (car (get-language-info language-name 'coding-priority))))