* emacs.c (init_cmdargs): Rename local to avoid shadowing.

diff --git a/src/ChangeLog b/src/ChangeLog
index da1b852f459862f206291de716a027a815569f14..951732a130687f84dfe34313b632bd5ae502f633 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-03-14  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * emacs.c (init_cmdargs): Rename local to avoid shadowing.
+
        * lisp.h (fatal_error_signal): Add decl, since it's exported.
 
        * dbusbind.c: Pointer signedness fixes.

diff --git a/src/emacs.c b/src/emacs.c
index 8b5daf8c7c6522f0987cd3c361c5e8155c1f5da4..0b508fb5be71177b3dfbb3f4a5a65bb169205b5e 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -382,7 +382,7 @@ static void
 init_cmdargs (int argc, char **argv, int skip_args)
 {
   register int i;
-  Lisp_Object name, dir, tem;
+  Lisp_Object name, dir, handler;
   int count = SPECPDL_INDEX ();
   Lisp_Object raw_name;
 
@@ -393,8 +393,8 @@ init_cmdargs (int argc, char **argv, int skip_args)
 
   /* Add /: to the front of the name
      if it would otherwise be treated as magic.  */
-  tem = Ffind_file_name_handler (raw_name, Qt);
-  if (! NILP (tem))
+  handler = Ffind_file_name_handler (raw_name, Qt);
+  if (! NILP (handler))
     raw_name = concat2 (build_string ("/:"), raw_name);
 
   Vinvocation_name = Ffile_name_nondirectory (raw_name);
@@ -411,8 +411,8 @@ init_cmdargs (int argc, char **argv, int skip_args)
        {
          /* Add /: to the front of the name
             if it would otherwise be treated as magic.  */
-         tem = Ffind_file_name_handler (found, Qt);
-         if (! NILP (tem))
+         handler = Ffind_file_name_handler (found, Qt);
+         if (! NILP (handler))
            found = concat2 (build_string ("/:"), found);
          Vinvocation_directory = Ffile_name_directory (found);
        }