[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110581: Increase NSTATICS; tell the
From: |
Daniel Colascione |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110581: Increase NSTATICS; tell the user when we run out of static slots. |
Date: |
Thu, 18 Oct 2012 09:00:08 -0800 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110581
committer: Daniel Colascione <address@hidden>
branch nick: cyg
timestamp: Thu 2012-10-18 09:00:08 -0800
message:
Increase NSTATICS; tell the user when we run out of static slots.
modified:
src/ChangeLog
src/alloc.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-10-18 08:27:49 +0000
+++ b/src/ChangeLog 2012-10-18 17:00:08 +0000
@@ -1,3 +1,9 @@
+2012-10-18 Daniel Colascione <address@hidden>
+
+ * alloc.c (NSTATICS): Increase from 0x650 to 0x1000
+ (staticpro): If we run out of staticpro slots, die with an
+ informative error instead of just calling emacs_abort.
+
2012-10-18 Martin Rudalics <address@hidden>
Fix two flaws reported by Dmitry Antipov.
=== modified file 'src/alloc.c'
--- a/src/alloc.c 2012-10-16 07:56:44 +0000
+++ b/src/alloc.c 2012-10-18 17:00:08 +0000
@@ -376,7 +376,7 @@
/* Addresses of staticpro'd variables. Initialize it to a nonzero
value; otherwise some compilers put it into BSS. */
-#define NSTATICS 0x650
+#define NSTATICS 0x1000
static Lisp_Object *staticvec[NSTATICS] = {&Vpurify_flag};
/* Index of next unused slot in staticvec. */
@@ -5030,7 +5030,7 @@
{
staticvec[staticidx++] = varaddress;
if (staticidx >= NSTATICS)
- emacs_abort ();
+ fatal ("NSTATICS too small. Try increasing and recompiling Emacs.");
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110581: Increase NSTATICS; tell the user when we run out of static slots.,
Daniel Colascione <=