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

* puresize.h (BASE_PURESIZE): Increase.

diff --git a/lisp/ChangeLog.multi-tty b/lisp/ChangeLog.multi-tty
index 3e5cf8660bff2313a5aae429c068887fa7fa8887..51ab6683323e9e6e613fe2e1abedef887f747ca2 100644 (file)
--- 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 3308b50a58887547bd9f9ca35daa7c1d384df883..b599069a7b441e493f5128fc5242c6c3e4f223f9 100644 (file)
--- 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 05a7ec48d06faebec065f1b7266b33a4a46dd3a4..ad5e8bb92d204dcdf2c0ec16ec17554e4b4fe36b 100644 (file)
--- 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 733d63e5ca6d6c1eb898e9feff1e9e76a56a3aa8..6af93742ac98aad06fb28a0791847c4b9111bf9a 100644 (file)
--- 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.  */