Mercurial > emacs
changeset 83543:6b25ef5cc276
Fix obvious runtime errors after merge.
* lisp/term/x-win.el (x-initialize-window-system): Make a copy of pure list.
* src/puresize.h (BASE_PURESIZE): Increase puresize.
* src/alloc.c (emacs_blocked_malloc): Disable mallopt call.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-583
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Sat, 14 Oct 2006 18:40:58 +0000 |
| parents | 2d56e13fd23d |
| children | 58cf725f5330 |
| files | lisp/term/x-win.el src/alloc.c src/puresize.h |
| diffstat | 3 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/term/x-win.el Sat Oct 14 17:36:28 2006 +0000 +++ b/lisp/term/x-win.el Sat Oct 14 18:40:58 2006 +0000 @@ -2524,9 +2524,10 @@ ;; Override Paste so it looks at CLIPBOARD first. (define-key menu-bar-edit-menu [paste] - '(menu-item "Paste" x-clipboard-yank - :enable (not buffer-read-only) - :help "Paste (yank) text most recently cut/copied")) + (append '(menu-item "Paste" x-clipboard-yank + :enable (not buffer-read-only) + :help "Paste (yank) text most recently cut/copied") + nil)) (setq x-initialized t))
--- a/src/alloc.c Sat Oct 14 17:36:28 2006 +0000 +++ b/src/alloc.c Sat Oct 14 18:40:58 2006 +0000 @@ -1238,7 +1238,8 @@ BLOCK_INPUT_ALLOC; __malloc_hook = old_malloc_hook; #ifdef DOUG_LEA_MALLOC - mallopt (M_TOP_PAD, malloc_hysteresis * 4096); + /* Segfaults on my system. --lorentey */ + /* mallopt (M_TOP_PAD, malloc_hysteresis * 4096); */ #else __malloc_extra_blocks = malloc_hysteresis; #endif
--- a/src/puresize.h Sat Oct 14 17:36:28 2006 +0000 +++ b/src/puresize.h Sat Oct 14 18:40:58 2006 +0000 @@ -43,7 +43,7 @@ #endif #ifndef BASE_PURESIZE -#define BASE_PURESIZE (1130000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA) +#define BASE_PURESIZE (1140000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA) #endif /* Increase BASE_PURESIZE by a ratio depending on the machine's word size. */