diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2007-07-29 16:00:42 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2007-07-29 16:00:42 +0000 |
| commit | 79f7f08a60ba3c4fbac3c9162ea613b23d05d1c7 (patch) | |
| tree | c54351dcbcf6aec150f0e0649b1471d5cfbe7e5f /src | |
| parent | 492d9f3e3ccd2b640958e840caa451e9e04e86db (diff) | |
| download | emacs-79f7f08a60ba3c4fbac3c9162ea613b23d05d1c7.tar.gz emacs-79f7f08a60ba3c4fbac3c9162ea613b23d05d1c7.tar.bz2 emacs-79f7f08a60ba3c4fbac3c9162ea613b23d05d1c7.zip | |
* term/xterm.el (terminal-init-xterm): Fix merge issue.
* puresize.h (BASE_PURESIZE): Increase.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog.multi-tty | 4 | ||||
| -rw-r--r-- | src/puresize.h | 2 |
2 files changed, 5 insertions, 1 deletions
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. */ |