From: Karoly Lorentey <lorentey@elte.hu>
Date: Sat, 14 Oct 2006 18:40:58 +0000 (+0000)
Subject: Fix obvious runtime errors after merge.
X-Git-Tag: emacs-pretest-23.0.90~11236^2~141^2~22
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5665a02fd1d009506f246d5f77896e3995127954;p=emacs.git

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
---

diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 967d9918b59..aba5c6d1e4c 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -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))
 
diff --git a/src/alloc.c b/src/alloc.c
index 5cfcda2e1e0..2f186fd3d12 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -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
diff --git a/src/puresize.h b/src/puresize.h
index d5a33e3cda5..bd8d74f4df6 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 (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.  */