Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emacs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
emacs
emacs
Commits
a3e8cbda
Commit
a3e8cbda
authored
Mar 16, 2011
by
Paul Eggert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* callint.c (Fcall_interactively): Rename locals to avoid shadowing.
parent
b1349114
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
11 deletions
+12
-11
src/ChangeLog
src/ChangeLog
+1
-0
src/callint.c
src/callint.c
+11
-11
No files found.
src/ChangeLog
View file @
a3e8cbda
2011-03-16 Paul Eggert <eggert@cs.ucla.edu>
* callint.c (quotify_arg, quotify_args): Now static.
(Fcall_interactively): Rename locals to avoid shadowing.
* lisp.h (get_system_name, get_operating_system_release):
Move decls here, to check interfaces.
src/callint.c
View file @
a3e8cbda
...
...
@@ -408,25 +408,25 @@ invoke it. If KEYS is omitted or nil, the return value of
string
++
;
else
if
(
*
string
==
'@'
)
{
Lisp_Object
event
,
tem
;
Lisp_Object
event
,
w
;
event
=
(
next_event
<
key_count
?
AREF
(
keys
,
next_event
)
:
Qnil
);
if
(
EVENT_HAS_PARAMETERS
(
event
)
&&
(
tem
=
XCDR
(
event
),
CONSP
(
tem
))
&&
(
tem
=
XCAR
(
tem
),
CONSP
(
tem
))
&&
(
tem
=
XCAR
(
tem
),
WINDOWP
(
tem
)))
&&
(
w
=
XCDR
(
event
),
CONSP
(
w
))
&&
(
w
=
XCAR
(
w
),
CONSP
(
w
))
&&
(
w
=
XCAR
(
w
),
WINDOWP
(
w
)))
{
if
(
MINI_WINDOW_P
(
XWINDOW
(
tem
))
&&
!
(
minibuf_level
>
0
&&
EQ
(
tem
,
minibuf_window
)))
if
(
MINI_WINDOW_P
(
XWINDOW
(
w
))
&&
!
(
minibuf_level
>
0
&&
EQ
(
w
,
minibuf_window
)))
error
(
"Attempt to select inactive minibuffer window"
);
/* If the current buffer wants to clean up, let it. */
if
(
!
NILP
(
Vmouse_leave_buffer_hook
))
call1
(
Vrun_hooks
,
Qmouse_leave_buffer_hook
);
Fselect_window
(
tem
,
Qnil
);
Fselect_window
(
w
,
Qnil
);
}
string
++
;
}
...
...
@@ -679,7 +679,7 @@ invoke it. If KEYS is omitted or nil, the return value of
int
first
=
1
;
do
{
Lisp_Object
tem
;
Lisp_Object
str
;
if
(
!
first
)
{
message
(
"Please enter a number."
);
...
...
@@ -687,13 +687,13 @@ invoke it. If KEYS is omitted or nil, the return value of
}
first
=
0
;
tem
=
Fread_from_minibuffer
(
callint_message
,
str
=
Fread_from_minibuffer
(
callint_message
,
Qnil
,
Qnil
,
Qnil
,
Qnil
,
Qnil
,
Qnil
);
if
(
!
STRINGP
(
tem
)
||
SCHARS
(
tem
)
==
0
)
if
(
!
STRINGP
(
str
)
||
SCHARS
(
str
)
==
0
)
args
[
i
]
=
Qnil
;
else
args
[
i
]
=
Fread
(
tem
);
args
[
i
]
=
Fread
(
str
);
}
while
(
!
NUMBERP
(
args
[
i
]));
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment