[Emacs-diffs] emacs/lisp/term xterm.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/12/10 15:02:42

Modified files:
        lisp/term      : xterm.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/term/xterm.el?cvsroot=emacs&r1=1.60&r2=1.61

Patches:
Index: xterm.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/term/xterm.el,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- xterm.el    6 Dec 2008 03:57:16 -0000       1.60
+++ xterm.el    10 Dec 2008 15:02:42 -0000      1.61
@@ -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