mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-04 11:40:22 +00:00
* term/xterm.el (terminal-init-xterm): Fix merge issue.
* puresize.h (BASE_PURESIZE): Increase.
This commit is contained in:
parent
492d9f3e3c
commit
79f7f08a60
@ -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
|
||||
|
@ -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
|
||||
|
@ -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,
|
||||
|
@ -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. */
|
||||
|
Loading…
Reference in New Issue
Block a user