Merge from trunk

1 files changed, 33 insertions, 30 deletions

diff --git a/src/eval.c b/src/eval.c
index 2fb89ce404e..c22e7d3f571 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -160,7 +160,7 @@ restore_stack_limits (Lisp_Object data)
 
 /* Call the Lisp debugger, giving it argument ARG.  */
 
-Lisp_Object
+static Lisp_Object
 call_debugger (Lisp_Object arg)
 {
   int debug_while_redisplaying;
@@ -216,7 +216,7 @@ call_debugger (Lisp_Object arg)
   return unbind_to (count, val);
 }
 
-void
+static void
 do_debug_on_call (Lisp_Object code)
 {
   debug_on_next_call = 0;
@@ -796,11 +796,11 @@ usage: (defvar SYMBOL &optional INITVALUE DOCSTRING)  */)
       if (SYMBOL_CONSTANT_P (sym))
         {
           /* For upward compatibility, allow (defvar :foo (quote :foo)).  */
-          Lisp_Object tem = Fcar (tail);
-          if (! (CONSP (tem)
-                 && EQ (XCAR (tem), Qquote)
-                 && CONSP (XCDR (tem))
-                 && EQ (XCAR (XCDR (tem)), sym)))
+          Lisp_Object tem1 = Fcar (tail);
+          if (! (CONSP (tem1)
+                 && EQ (XCAR (tem1), Qquote)
+                 && CONSP (XCDR (tem1))
+                 && EQ (XCAR (XCDR (tem1)), sym)))
             error ("Constant symbol `%s' specified in defvar",
                    SDATA (SYMBOL_NAME (sym)));
         }
@@ -840,11 +840,12 @@ usage: (defvar SYMBOL &optional INITVALUE DOCSTRING)  */)
     Vinternal_interpreter_environment =
       Fcons (sym, Vinternal_interpreter_environment);
   else
-    /* Simple (defvar <var>) should not count as a definition at all.
-       It could get in the way of other definitions, and unloading this
-       package could try to make the variable unbound.  */
-    ;
-      
+    {
+      /* Simple (defvar <var>) should not count as a definition at all.
+         It could get in the way of other definitions, and unloading this
+         package could try to make the variable unbound.  */
+    }
+
   return sym;
 }
 
@@ -895,7 +896,8 @@ user_variable_p_eh (Lisp_Object ignore)
 static Lisp_Object
 lisp_indirect_variable (Lisp_Object sym)
 {
-  XSETSYMBOL (sym, indirect_variable (XSYMBOL (sym)));
+  struct Lisp_Symbol *s = indirect_variable (XSYMBOL (sym));
+  XSETSYMBOL (sym, s);
   return sym;
 }
 
@@ -1720,7 +1722,7 @@ See also the function `condition-case'.  */)
       if (!NILP (clause))
         break;
     }
-          
+
   if (/* Don't run the debugger for a memory-full error.
          (There is no room in memory to do that!) */
       !NILP (error_symbol)
@@ -1737,13 +1739,13 @@ See also the function `condition-case'.  */)
          can continue code which has signaled a quit.  */
       if (debugger_called && EQ (real_error_symbol, Qquit))
         return Qnil;
-    }      
+    }
 
   if (!NILP (clause))
     {
       Lisp_Object unwind_data
         = (NILP (error_symbol) ? data : Fcons (error_symbol, data));
-      
+
       h->chosen_clause = clause;
       unwind_to_catch (h->tag, unwind_data);
     }
@@ -1755,7 +1757,7 @@ See also the function `condition-case'.  */)
 
   if (! NILP (error_symbol))
     data = Fcons (error_symbol, data);
-      
+
   string = Ferror_message_string (data);
   fatal ("%s", SDATA (string), 0);
 }
@@ -2648,8 +2650,8 @@ run_hook_with_args (int nargs, Lisp_Object *args, enum run_hooks_condition cond)
     }
   else
     {
-      Lisp_Object globals = Qnil;
-      GCPRO3 (sym, val, globals);
+      Lisp_Object global_vals = Qnil;
+      GCPRO3 (sym, val, global_vals);
 
       for (;
            CONSP (val) && ((cond == to_completion)
@@ -2661,23 +2663,25 @@ run_hook_with_args (int nargs, Lisp_Object *args, enum run_hooks_condition cond)
             {
               /* t indicates this hook has a local binding;
                  it means to run the global binding too.  */
-              globals = Fdefault_value (sym);
-              if (NILP (globals)) continue;
+              global_vals = Fdefault_value (sym);
+              if (NILP (global_vals)) continue;
 
-              if (!CONSP (globals) || EQ (XCAR (globals), Qlambda))
+              if (!CONSP (global_vals) || EQ (XCAR (global_vals), Qlambda))
                 {
-                  args[0] = globals;
+                  args[0] = global_vals;
                   ret = Ffuncall (nargs, args);
                 }
               else
                 {
                   for (;
-                       CONSP (globals) && ((cond == to_completion)
-                                           || (cond == until_success ? NILP (ret)
-                                               : !NILP (ret)));
-                       globals = XCDR (globals))
+                       (CONSP (global_vals)
+                        && (cond == to_completion
+                            || (cond == until_success
+                                ? NILP (ret)
+                                : !NILP (ret))));
+                       global_vals = XCDR (global_vals))
                     {
-                      args[0] = XCAR (globals);
+                      args[0] = XCAR (global_vals);
                       /* In a global value, t should not occur.  If it does, we
                          must ignore it to avoid an endless loop.  */
                       if (!EQ (args[0], Qt))
@@ -3248,7 +3252,7 @@ DEFUN ("fetch-bytecode", Ffetch_bytecode, Sfetch_bytecode,
   return object;
 }
 
-void
+static void
 grow_specpdl (void)
 {
   register int count = SPECPDL_INDEX ();
@@ -3823,4 +3827,3 @@ alist of active lexical bindings.  */);
   defsubr (&Sspecial_variable_p);
   defsubr (&Sfunctionp);
 }
-