Mercurial > emacs
changeset 83125:b545019c77b0
Add kludge to prevent overriding keyboard-coding-system customization.
lisp/international/mule-cmds.el (set-locale-environment): Don't set
keyboard-coding-system if it is already set (reported by Friedrich
Delgado Friedrichs).
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-165
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Tue, 18 May 2004 20:30:43 +0000 |
| parents | d153d9579f9b |
| children | 14e5707213a6 |
| files | README.multi-tty lisp/international/mule-cmds.el |
| diffstat | 2 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/README.multi-tty Tue May 18 19:58:00 2004 +0000 +++ b/README.multi-tty Tue May 18 20:30:43 2004 +0000 @@ -218,6 +218,10 @@ settings as Emacs itself. This may lead to bogus results in a multi-locale setup. (E.g., while logging in from a remote client with a different locale.) + (Update after new bugreport by Friedrich Delgado Friedrichs: + (at least) the structs terminal_coding and keyboard_coding in + coding.c must be moved to struct display, and the Lisp interface + [set-]keyboard-coding-system must be adapted for the change.) ** The single-keyboard mode of MULTI_KBOARD is extremely confusing sometimes; Emacs does not respond to stimuli from other keyboards.
--- a/lisp/international/mule-cmds.el Tue May 18 19:58:00 2004 +0000 +++ b/lisp/international/mule-cmds.el Tue May 18 20:30:43 2004 +0000 @@ -2400,7 +2400,13 @@ ;; Set the `keyboard-coding-system' if appropriate (tty ;; only). At least X and MS Windows can generate ;; multilingual input. - (unless window-system + (unless (or window-system + keyboard-coding-system) + ;; FIXME: keyboard-coding-system must be removed from the above + ;; condition when multi-tty locale handling is correctly + ;; implemented. Also, unconditionally overriding it with nil + ;; is not a good idea, as it ignores the user's + ;; customization. -- lorentey (let ((kcs (or coding-system (car (get-language-info language-name 'coding-system)))))