Mercurial > emacs

changeset 83646:cac66c12e45d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* term/xterm.el (terminal-init-xterm): Fix merge issue. * puresize.h (BASE_PURESIZE): Increase.
author Dan Nicolaescu <dann@ics.uci.edu>
date Sun, 29 Jul 2007 16:00:42 +0000
parents fd5b4a865d1d
children 3468e549a55b
files lisp/ChangeLog.multi-tty lisp/term/xterm.el src/ChangeLog.multi-tty src/puresize.h
diffstat 4 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog.multi-tty	Tue Jul 24 01:25:28 2007 +0000
+++ b/lisp/ChangeLog.multi-tty	Sun Jul 29 16:00:42 2007 +0000
@@ -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
--- a/lisp/term/xterm.el	Tue Jul 24 01:25:28 2007 +0000
+++ b/lisp/term/xterm.el	Sun Jul 29 16:00:42 2007 +0000
@@ -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
--- a/src/ChangeLog.multi-tty	Tue Jul 24 01:25:28 2007 +0000
+++ b/src/ChangeLog.multi-tty	Sun Jul 29 16:00:42 2007 +0000
@@ -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,
--- a/src/puresize.h	Tue Jul 24 01:25:28 2007 +0000
+++ b/src/puresize.h	Sun Jul 29 16:00:42 2007 +0000
@@ -43,7 +43,7 @@
 #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.  */