(Fset_char_table_parent): Fix previous change.

[gnu-emacs] / src / alloc.c

diff --git a/src/alloc.c b/src/alloc.c
index 002dc51ddb974dac5abf76b18d5353938405b4a1..a2a2a661e0c982c532b77a455f8afe62038fb7a3 100644 (file)
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -151,7 +151,7 @@ Lisp_Object memory_signal_data;
 /* Define DONT_COPY_FLAG to be some bit which will always be zero in a
    pointer to a Lisp_Object, when that pointer is viewed as an integer.
    (On most machines, pointers are even, so we can use the low bit.
-   Word-addressible architectures may need to override this in the m-file.)
+   Word-addressable architectures may need to override this in the m-file.)
    When linking references to small strings through the size field, we
    use this slot to hold the bit that would otherwise be interpreted as
    the GC mark bit.  */
@@ -686,10 +686,14 @@ Any number of arguments, even zero arguments, are allowed.")
      int nargs;
      register Lisp_Object *args;
 {
-  register Lisp_Object val = Qnil;
+  register Lisp_Object val;
+  val = Qnil;
 
-  while (nargs--)
-    val = Fcons (args[nargs], val);
+  while (nargs > 0)
+    {
+      nargs--;
+      val = Fcons (args[nargs], val);
+    }
   return val;
 }
 
@@ -866,13 +870,13 @@ init_symbol ()
 DEFUN ("make-symbol", Fmake_symbol, Smake_symbol, 1, 1, 0,
   "Return a newly allocated uninterned symbol whose name is NAME.\n\
 Its value and function definition are void, and its property list is nil.")
-  (str)
-     Lisp_Object str;
+  (name)
+     Lisp_Object name;
 {
   register Lisp_Object val;
   register struct Lisp_Symbol *p;
 
-  CHECK_STRING (str, 0);
+  CHECK_STRING (name, 0);
 
   if (symbol_free_list)
     {
@@ -895,7 +899,7 @@ Its value and function definition are void, and its property list is nil.")
       XSETSYMBOL (val, &symbol_block->symbols[symbol_block_index++]);
     }
   p = XSYMBOL (val);
-  p->name = XSTRING (str);
+  p->name = XSTRING (name);
   p->plist = Qnil;
   p->value = Qunbound;
   p->function = Qunbound;
@@ -1091,7 +1095,7 @@ Both LENGTH and INIT must be numbers.  INIT matters only in whether it is t or n
 
   CHECK_NATNUM (length, 0);
 
-  bits_per_value = sizeof (EMACS_INT) * INTBITS / sizeof (int);
+  bits_per_value = sizeof (EMACS_INT) * BITS_PER_CHAR;
 
   length_in_elts = (XFASTINT (length) + bits_per_value - 1) / bits_per_value;
   length_in_chars = length_in_elts * sizeof (EMACS_INT);
@@ -1428,7 +1432,7 @@ inhibit_garbage_collection ()
 {
   int count = specpdl_ptr - specpdl;
   Lisp_Object number;
-  int nbits = min (VALBITS, INTBITS);
+  int nbits = min (VALBITS, BITS_PER_INT);
 
   XSETINT (number, ((EMACS_INT) 1 << (nbits - 1)) - 1);
 
@@ -1699,9 +1703,10 @@ Lisp_Object *last_marked[LAST_MARKED_SIZE];
 int last_marked_index;
 
 static void
-mark_object (objptr)
-     Lisp_Object *objptr;
+mark_object (argptr)
+     Lisp_Object *argptr;
 {
+  Lisp_Object *objptr = argptr;
   register Lisp_Object obj;
 
  loop:
@@ -2152,7 +2157,7 @@ gc_sweep ()
 
 #ifndef standalone
   /* Put all unmarked markers on free list.
-     Dechain each one first from the buffer it points into,
+     Unchain each one first from the buffer it points into,
      but only if it's a real marker.  */
   {
     register struct marker_block *mblk;