Increase NSTATICS; tell the user when we run out of static slots.

diff --git a/src/ChangeLog b/src/ChangeLog
index 817274b56910d379184647c2db5320932fd4e076..6fece1e72c57c7c5ec6ef250d5168bdb7adcc028 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-18  Daniel Colascione  <dancol@dancol.org>
+
+       * 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  <rudalics@gmx.at>
 
        Fix two flaws reported by Dmitry Antipov.

diff --git a/src/alloc.c b/src/alloc.c
index 0afe446d26902a796c990a98db336b6589e49e31..08dc26784cc32275f17fe1608f8d7da3f0133d31 100644 (file)
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -376,7 +376,7 @@ struct gcpro *gcprolist;
 /* 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 @@ staticpro (Lisp_Object *varaddress)
 {
   staticvec[staticidx++] = varaddress;
   if (staticidx >= NSTATICS)
-    emacs_abort ();
+    fatal ("NSTATICS too small. Try increasing and recompiling Emacs.");
 }
 
 \f