* term/xterm.el (terminal-init-xterm): Fix merge issue.

* puresize.h (BASE_PURESIZE): Increase.

2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/ChangeLog.multi-tty b/lisp/ChangeLog.multi-tty
index 3e5cf8660bf..51ab6683323 100644
--- a/lisp/ChangeLog.multi-tty
+++ b/lisp/ChangeLog.multi-tty
@@ -1,3 +1,7 @@
+2007-07-29  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * term/xterm.el (terminal-init-xterm): Fix merge issue.
+
 2007-07-02  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * env.el (read-envvar-name): Don't consider the environment frame
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index 3308b50a588..b599069a7b4 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -431,7 +431,7 @@
               (add-hook 'suspend-hook 'xterm-turn-off-modify-other-keys)
               (add-hook 'suspend-resume-hook 'xterm-turn-on-modify-other-keys)
               (add-hook 'kill-emacs-hook 'xterm-turn-off-modify-other-keys)
-              (xterm-turn-on-modify-other-keys))))))))
+              (xterm-turn-on-modify-other-keys)))))))
 
 ;; Set up colors, for those versions of xterm that support it.
 (defvar xterm-standard-colors