automatically generated from GPLed version

[gnu-emacs] / src / alloc.c

diff --git a/src/alloc.c b/src/alloc.c
index 536286ff16639680681c9962d97076af691d2e42..b6480a63c816d996ab02ceb2d8d7915a56bcf7bd 100644 (file)
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -214,9 +214,9 @@ display_malloc_warning ()
 }
 
 #ifdef DOUG_LEA_MALLOC
-  #define BYTES_USED (mallinfo ().arena)
+#  define BYTES_USED (mallinfo ().arena)
 #else
-  #define BYTES_USED _bytes_used
+#  define BYTES_USED _bytes_used
 #endif
 
 /* Called if malloc returns zero */
@@ -237,7 +237,7 @@ memory_full ()
   /* This used to call error, but if we've run out of memory, we could get
      infinite recursion trying to build the string.  */
   while (1)
-    Fsignal (Qerror, memory_signal_data);
+    Fsignal (Qnil, memory_signal_data);
 }
 
 /* Called if we can't allocate relocatable space for a buffer.  */
@@ -374,11 +374,11 @@ emacs_blocked_malloc (size)
 
   BLOCK_INPUT;
   __malloc_hook = old_malloc_hook;
-  #ifdef DOUG_LEA_MALLOC
+#ifdef DOUG_LEA_MALLOC
     mallopt (M_TOP_PAD, malloc_hysteresis * 4096);
-  #else
+#else
     __malloc_extra_blocks = malloc_hysteresis;
-  #endif
+#endif
   value = (void *) malloc (size);
   __malloc_hook = emacs_blocked_malloc;
   UNBLOCK_INPUT;
@@ -514,7 +514,7 @@ mark_interval_tree (tree)
 #define MARK_INTERVAL_TREE(i)                          \
   do {                                                 \
     if (!NULL_INTERVAL_P (i)                           \
-       && ! XMARKBIT ((Lisp_Object) i->parent))        \
+       && ! XMARKBIT (*(Lisp_Object *) &i->parent))    \
       mark_interval_tree (i);                          \
   } while (0)
 
@@ -876,7 +876,7 @@ significance.")
        args[index] = Fpurecopy (args[index]);
       p->contents[index] = args[index];
     }
-  XSETCOMPILED (val, val);
+  XSETCOMPILED (val, p);
   return val;
 }
 \f
@@ -1130,8 +1130,8 @@ Both LENGTH and INIT must be numbers.")
 }
 
 DEFUN ("make-bool-vector", Fmake_bool_vector, Smake_bool_vector, 2, 2, 0,
-  "Return a newly created bitstring of length LENGTH, with INIT as each element.\n\
-Both LENGTH and INIT must be numbers.  INIT matters only in whether it is t or nil.")
+  "Return a new bool-vector of length LENGTH, using INIT for as each element.\n\
+LENGTH must be a number.  INIT matters only in whether it is t or nil.")
   (length, init)
      Lisp_Object length, init;
 {
@@ -1274,7 +1274,7 @@ make_event_array (nargs, args)
   {
     Lisp_Object result;
     
-    result = Fmake_string (nargs, make_number (0));
+    result = Fmake_string (make_number (nargs), make_number (0));
     for (i = 0; i < nargs; i++)
       {
        XSTRING (result)->data[i] = XINT (args[i]);
@@ -2264,7 +2264,7 @@ gc_sweep ()
              case Lisp_Misc_Free:
                /* If the object was already free, keep it
                   on the free list.  */
-               markword = &already_free;
+               markword = (Lisp_Object *) &already_free;
                break;
              default:
                markword = 0;