Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-409
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-410
   Make sure image types are initialized for lookup too

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-411
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-412
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-413
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-414
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-415
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-416
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-417
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-418
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-419
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-202

1 files changed, 62 insertions, 1 deletions

diff --git a/src/lisp.h b/src/lisp.h
index fdf76399e5d..ba2508e827b 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1199,7 +1199,10 @@ struct Lisp_Save_Value
   {
     int type : 16;      /* = Lisp_Misc_Save_Value */
     unsigned gcmarkbit : 1;
-    int spacer : 15;
+    int spacer : 14;
+    /* If DOGC is set, POINTER is the address of a memory
+       area containing INTEGER potential Lisp_Objects.  */
+    unsigned int dogc : 1;
     void *pointer;
     int integer;
   };
@@ -3248,6 +3251,64 @@ extern Lisp_Object Vdirectory_sep_char;
          : Fcons ((el), (check)))))
 
 
+/* SAFE_ALLOCA normally allocates memory on the stack, but if size is
+   larger than MAX_ALLOCA, use xmalloc to avoid overflowing the stack.  */
+
+#define MAX_ALLOCA 16*1024
+
+extern Lisp_Object safe_alloca_unwind (Lisp_Object);
+
+#define USE_SAFE_ALLOCA                 \
+  int sa_count = SPECPDL_INDEX ()
+
+/* SAFE_ALLOCA allocates a simple buffer.  */
+
+#define SAFE_ALLOCA(buf, type, size)                      \
+  do {                                                    \
+    if ((size) < MAX_ALLOCA)                              \
+      buf = (type) alloca (size);                         \
+    else                                                  \
+      {                                                   \
+        buf = (type) xmalloc (size);                      \
+        record_unwind_protect (safe_alloca_unwind,        \
+                               make_save_value (buf, 0)); \
+      }                                                   \
+  } while (0)
+
+/* SAFE_FREE frees xmalloced memory and enables GC as needed.  */
+
+#define SAFE_FREE(size)                 \
+  do {                                  \
+    if ((size) >= MAX_ALLOCA)           \
+      unbind_to (sa_count, Qnil);       \
+  } while (0)
+
+
+/* SAFE_ALLOCA_LISP allocates an array of Lisp_Objects.  */
+
+#define SAFE_ALLOCA_LISP(buf, nelt)                       \
+  do {                                                    \
+    int size_ = (nelt) * sizeof (Lisp_Object);            \
+    if (size_ < MAX_ALLOCA)                               \
+      buf = (Lisp_Object *) alloca (size_);               \
+    else                                                  \
+      {                                                   \
+        Lisp_Object arg_;                                 \
+        buf = (Lisp_Object *) xmalloc (size_);            \
+        arg_ = make_save_value (buf, nelt);               \
+        XSAVE_VALUE (arg_)->dogc = 1;                     \
+        record_unwind_protect (safe_alloca_unwind, arg_); \
+      }                                                   \
+  } while (0)
+
+#define SAFE_FREE_LISP(nelt)                            \
+  do {                                                  \
+    if (((nelt) * sizeof (Lisp_Object)) >= MAX_ALLOCA)  \
+      unbind_to (sa_count, Qnil);                       \
+  } while (0)
+
+
+
 #endif /* EMACS_LISP_H */
 
 /* arch-tag: 9b2ed020-70eb-47ac-94ee-e1c2a5107d5e