From: Chong Yidong <cyd@stupidchicken.com>
Date: Wed, 10 Dec 2008 15:02:42 +0000 (+0000)
Subject: (xterm-remove-modify-other-keys): Fix error in terminal variable
X-Git-Tag: emacs-pretest-23.0.90~1184
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c2a008832d8c605ad1d80e04336132351aa36324;p=emacs.git

(xterm-remove-modify-other-keys): Fix error in terminal variable
assignment.
---

diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index e893f88da50..aaa935e43cc 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -642,7 +642,7 @@ versions of xterm."
 
 (defun xterm-remove-modify-other-keys (&optional terminal)
   "Turn off the modifyOtherKeys feature of xterm for good."
-  (setq terminal (and terminal (frame-terminal (selected-frame))))
+  (setq terminal (or terminal (frame-terminal (selected-frame))))
   (when (and (terminal-live-p terminal)
 	     (memq terminal xterm-modify-other-keys-terminal-list))
     (setq xterm-modify-other-keys-terminal-list