aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Love2002-05-15 18:22:43 +0000
committerDave Love2002-05-15 18:22:43 +0000
commit38b7e16086c006b0d178b71ad0ad29f57bc5df20 (patch)
tree5310158d16b9c112bf65c54f2de6eb3657e3dda8
parent279b5494837e25781f9c609dd5d4fd6b8380b1a3 (diff)
downloademacs-38b7e16086c006b0d178b71ad0ad29f57bc5df20.tar.gz
emacs-38b7e16086c006b0d178b71ad0ad29f57bc5df20.zip
(set-locale-environment): Comment out
set-keyboard-coding-system stuff.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/international/mule-cmds.el14
2 files changed, 13 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 33ad463b623..433786a1c83 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12002-05-15 Dave Love <fx@gnu.org>
2
3 * international/mule-cmds.el (set-locale-environment): Comment out
4 set-keyboard-coding-system stuff.
5
12002-05-14 Kenichi Handa <handa@etl.go.jp> 62002-05-14 Kenichi Handa <handa@etl.go.jp>
2 7
3 * international/mule.el (define-coding-system): Docstring 8 * international/mule.el (define-coding-system): Docstring
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index dde728f419d..f8ab55fc2bf 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1954,12 +1954,14 @@ See also `locale-charset-language-names', `locale-language-names',
1954 (when default-enable-multibyte-characters 1954 (when default-enable-multibyte-characters
1955 (set-display-table-and-terminal-coding-system language-name)) 1955 (set-display-table-and-terminal-coding-system language-name))
1956 1956
1957 ;; Set the `keyboard-coding-system' if appropriate. 1957;;; encoded-kbd-mode doesn't work properly at present, and i don't
1958 (let ((kcs (or coding-system 1958;;; think this is the right thing to do anyhow. -- fx
1959 (car (get-language-info language-name 1959;;; ;; Set the `keyboard-coding-system' if appropriate.
1960 'coding-system))))) 1960;;; (let ((kcs (or coding-system
1961 (if (memq kcs standard-keyboard-coding-systems) 1961;;; (car (get-language-info language-name
1962 (set-keyboard-coding-system kcs))) 1962;;; 'coding-system)))))
1963;;; (if (memq kcs standard-keyboard-coding-systems)
1964;;; (set-keyboard-coding-system kcs)))
1963 1965
1964 (setq locale-coding-system 1966 (setq locale-coding-system
1965 (car (get-language-info language-name 'coding-priority)))) 1967 (car (get-language-info language-name 'coding-priority))))