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
Open sidebar
emacs
emacs
Commits
c4f46926
Commit
c4f46926
authored
Jul 25, 2007
by
Stefan Monnier
Browse files
(Finteractive_form): Check for the presence of an
`interactive-form' symbol property more thoroughly.
parent
b7de6024
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
10 deletions
+24
-10
src/ChangeLog
src/ChangeLog
+6
-1
src/data.c
src/data.c
+18
-9
No files found.
src/ChangeLog
View file @
c4f46926
2007-07-25 Stefan Monnier <monnier@iro.umontreal.ca>
* data.c (Finteractive_form): Use a `interactive-form' property if
* eval.c (Fcommandp): Pay attention to the `interactive-form' property.
* data.c (Finteractive_form): Check for the presence of an
`interactive-form' symbol property more thoroughly.
* data.c (Finteractive_form): Use an `interactive-form' property if
present, analogous to the function-documentation property.
2007-07-22 Nick Roberts <nickrob@snap.net.nz>
...
...
src/data.c
View file @
c4f46926
...
...
@@ -750,15 +750,24 @@ Value, if non-nil, is a list \(interactive SPEC). */)
(
cmd
)
Lisp_Object
cmd
;
{
Lisp_Object
fun
=
indirect_function
(
cmd
);
Lisp_Object
tmp
;
if
(
SYMBOLP
(
cmd
)
/* Use an `interactive-form' property if present, analogous to the
function-documentation property. */
&&
(
tmp
=
Fget
(
cmd
,
intern
(
"interactive-form"
)),
!
NILP
(
tmp
)))
return
tmp
;
else
if
(
SUBRP
(
fun
))
Lisp_Object
fun
=
indirect_function
(
cmd
);
/* Check cycles. */
if
(
NILP
(
fun
)
||
EQ
(
fun
,
Qunbound
))
return
Qnil
;
/* Use an `interactive-form' property if present, analogous to the
function-documentation property. */
fun
=
cmd
;
while
(
SYMBOLP
(
fun
))
{
Lisp_Object
tmp
=
Fget
(
fun
,
intern
(
"interactive-form"
));
if
(
!
NILP
(
tmp
))
return
tmp
;
else
fun
=
Fsymbol_function
(
fun
);
}
if
(
SUBRP
(
fun
))
{
if
(
XSUBR
(
fun
)
->
prompt
)
return
list2
(
Qinteractive
,
build_string
(
XSUBR
(
fun
)
->
prompt
));
...
...
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