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

* puresize.h (BASE_PURESIZE): Increase.

4 files changed, 10 insertions, 2 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
diff --git a/src/ChangeLog.multi-tty b/src/ChangeLog.multi-tty
index 05a7ec48d06..ad5e8bb92d2 100644
--- a/src/ChangeLog.multi-tty
+++ b/src/ChangeLog.multi-tty
@@ -1,3 +1,7 @@
+2007-07-29  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * puresize.h (BASE_PURESIZE): Increase.
+
 2007-07-02  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * frame.c (Qterm_environment_variable,
diff --git a/src/puresize.h b/src/puresize.h
index 733d63e5ca6..6af93742ac9 100644
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -43,7 +43,7 @@ Boston, MA 02110-1301, USA.  */
 #endif
 
 #ifndef BASE_PURESIZE
-#define BASE_PURESIZE (1140000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
+#define BASE_PURESIZE (1143000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
 #endif
 
 /* Increase BASE_PURESIZE by a ratio depending on the machine's word size.  */