# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1228921362 0
# Node ID e11ed8333674c4a733b188cb0cf873d57f0fceb5
# Parent  371187872b5af598de2f188683395902795ab339
(xterm-remove-modify-other-keys): Fix error in terminal variable
assignment.

diff -r 371187872b5a -r e11ed8333674 lisp/term/xterm.el
--- a/lisp/term/xterm.el	Wed Dec 10 15:02:31 2008 +0000
+++ b/lisp/term/xterm.el	Wed Dec 10 15:02:42 2008 +0000
@@ -642,7 +642,7 @@
 
 (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