# HG changeset patch # User Dan Nicolaescu # Date 1185724842 0 # Node ID cac66c12e45dcd1459823896811c7df70d18e60e # Parent fd5b4a865d1dd6e1e0e6fd9a372b70916d14606d * term/xterm.el (terminal-init-xterm): Fix merge issue. * puresize.h (BASE_PURESIZE): Increase. diff -r fd5b4a865d1d -r cac66c12e45d lisp/ChangeLog.multi-tty --- 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 + + * term/xterm.el (terminal-init-xterm): Fix merge issue. + 2007-07-02 Dan Nicolaescu * env.el (read-envvar-name): Don't consider the environment frame diff -r fd5b4a865d1d -r cac66c12e45d lisp/term/xterm.el --- 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 diff -r fd5b4a865d1d -r cac66c12e45d src/ChangeLog.multi-tty --- 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 + + * puresize.h (BASE_PURESIZE): Increase. + 2007-07-02 Dan Nicolaescu * frame.c (Qterm_environment_variable, diff -r fd5b4a865d1d -r cac66c12e45d src/puresize.h --- 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. */