Commit a3e8cbda authored by Paul Eggert's avatar Paul Eggert
Browse files

* callint.c (Fcall_interactively): Rename locals to avoid shadowing.

parent b1349114
2011-03-16 Paul Eggert <eggert@cs.ucla.edu> 2011-03-16 Paul Eggert <eggert@cs.ucla.edu>
   
* callint.c (quotify_arg, quotify_args): Now static. * callint.c (quotify_arg, quotify_args): Now static.
(Fcall_interactively): Rename locals to avoid shadowing.
   
* lisp.h (get_system_name, get_operating_system_release): * lisp.h (get_system_name, get_operating_system_release):
Move decls here, to check interfaces. Move decls here, to check interfaces.
...@@ -408,25 +408,25 @@ invoke it. If KEYS is omitted or nil, the return value of ...@@ -408,25 +408,25 @@ invoke it. If KEYS is omitted or nil, the return value of
string++; string++;
else if (*string == '@') else if (*string == '@')
{ {
Lisp_Object event, tem; Lisp_Object event, w;
event = (next_event < key_count event = (next_event < key_count
? AREF (keys, next_event) ? AREF (keys, next_event)
: Qnil); : Qnil);
if (EVENT_HAS_PARAMETERS (event) if (EVENT_HAS_PARAMETERS (event)
&& (tem = XCDR (event), CONSP (tem)) && (w = XCDR (event), CONSP (w))
&& (tem = XCAR (tem), CONSP (tem)) && (w = XCAR (w), CONSP (w))
&& (tem = XCAR (tem), WINDOWP (tem))) && (w = XCAR (w), WINDOWP (w)))
{ {
if (MINI_WINDOW_P (XWINDOW (tem)) if (MINI_WINDOW_P (XWINDOW (w))
&& ! (minibuf_level > 0 && EQ (tem, minibuf_window))) && ! (minibuf_level > 0 && EQ (w, minibuf_window)))
error ("Attempt to select inactive minibuffer window"); error ("Attempt to select inactive minibuffer window");
/* If the current buffer wants to clean up, let it. */ /* If the current buffer wants to clean up, let it. */
if (!NILP (Vmouse_leave_buffer_hook)) if (!NILP (Vmouse_leave_buffer_hook))
call1 (Vrun_hooks, Qmouse_leave_buffer_hook); call1 (Vrun_hooks, Qmouse_leave_buffer_hook);
Fselect_window (tem, Qnil); Fselect_window (w, Qnil);
} }
string++; string++;
} }
...@@ -679,7 +679,7 @@ invoke it. If KEYS is omitted or nil, the return value of ...@@ -679,7 +679,7 @@ invoke it. If KEYS is omitted or nil, the return value of
int first = 1; int first = 1;
do do
{ {
Lisp_Object tem; Lisp_Object str;
if (! first) if (! first)
{ {
message ("Please enter a number."); message ("Please enter a number.");
...@@ -687,13 +687,13 @@ invoke it. If KEYS is omitted or nil, the return value of ...@@ -687,13 +687,13 @@ invoke it. If KEYS is omitted or nil, the return value of
} }
first = 0; first = 0;
tem = Fread_from_minibuffer (callint_message, str = Fread_from_minibuffer (callint_message,
Qnil, Qnil, Qnil, Qnil, Qnil, Qnil, Qnil, Qnil, Qnil, Qnil,
Qnil); Qnil);
if (! STRINGP (tem) || SCHARS (tem) == 0) if (! STRINGP (str) || SCHARS (str) == 0)
args[i] = Qnil; args[i] = Qnil;
else else
args[i] = Fread (tem); args[i] = Fread (str);
} }
while (! NUMBERP (args[i])); while (! NUMBERP (args[i]));
} }
......
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