Commit 5665a02f authored by Karoly Lorentey's avatar Karoly Lorentey
Browse files

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
parent 12b6af5c
......@@ -2524,9 +2524,10 @@ order until succeed.")
;; 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))
......
......@@ -1238,7 +1238,8 @@ emacs_blocked_malloc (size, ptr)
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
......
......@@ -43,7 +43,7 @@ Boston, MA 02110-1301, USA. */
#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. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment