Commit 74f10ca7 authored by Paul Eggert's avatar Paul Eggert

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

parent 60393507
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.
......@@ -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);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment