aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaroly Lorentey2005-07-12 11:09:18 +0000
committerKaroly Lorentey2005-07-12 11:09:18 +0000
commitf3d34677608e5c7b95e2b3da2ddbe0124b36ffec (patch)
tree87a0561f6aa5a5d6e42893c5a26df35564f9b85a
parentac09dc1ec3f67a1a7a26411106480fea4e4d90b2 (diff)
downloademacs-f3d34677608e5c7b95e2b3da2ddbe0124b36ffec.tar.gz
emacs-f3d34677608e5c7b95e2b3da2ddbe0124b36ffec.zip
Fix dumb error leading to national keys not working on ttys.
* lisp/international/encoded-kb.el (encoded-kbd-setup-display): Fix broken condition before set-input-mode. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-387
-rw-r--r--lisp/international/encoded-kb.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/international/encoded-kb.el b/lisp/international/encoded-kb.el
index b5394435e80..9220970f5bd 100644
--- a/lisp/international/encoded-kb.el
+++ b/lisp/international/encoded-kb.el
@@ -276,12 +276,12 @@ DISPLAY may be a display id, a frame, or nil for the selected frame's display."
276 result) 276 result)
277 (set-keymap-parent keymap (terminal-local-value 'local-key-translation-map frame)) 277 (set-keymap-parent keymap (terminal-local-value 'local-key-translation-map frame))
278 (set-terminal-local-value 'local-key-translation-map frame keymap) 278 (set-terminal-local-value 'local-key-translation-map frame keymap)
279 (or (terminal-parameter nil 'encoded-kbd-saved-input-mode) 279 (unless (terminal-parameter nil 'encoded-kbd-saved-input-mode)
280 (set-terminal-parameter nil 'encoded-kbd-saved-input-mode cim)) 280 (set-terminal-parameter nil 'encoded-kbd-saved-input-mode cim))
281 (setq result (and coding (encoded-kbd-setup-keymap keymap coding))) 281 (setq result (and coding (encoded-kbd-setup-keymap keymap coding)))
282 (if result 282 (if result
283 (when (and (eq result 8) 283 (when (and (eq result 8)
284 (not (memq (nth 2 cim) '(t nil)))) 284 (memq (nth 2 cim) '(t nil)))
285 (set-input-mode 285 (set-input-mode
286 (nth 0 cim) 286 (nth 0 cim)
287 (nth 1 cim) 287 (nth 1 cim)