diff options
| author | Stefan Monnier | 2012-11-19 23:24:09 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2012-11-19 23:24:09 -0500 |
| commit | 23ba2705e22b89154ef7cbb0595419732080b94c (patch) | |
| tree | b9ca597bccdbbc6467e0fa76ea1fb321fcb0f5c0 /src/bytecode.c | |
| parent | b0636be7f9526041aeaa9f4fb6d3636426eec899 (diff) | |
| download | emacs-23ba2705e22b89154ef7cbb0595419732080b94c.tar.gz emacs-23ba2705e22b89154ef7cbb0595419732080b94c.zip | |
Make called-interactively-p work for edebug or advised code.
* lisp/subr.el (called-interactively-p-functions): New var.
(internal--called-interactively-p--get-frame): New macro.
(called-interactively-p, interactive-p): Rewrite in Lisp.
* lisp/emacs-lisp/nadvice.el (advice--called-interactively-skip): New fun.
(called-interactively-p-functions): Use it.
* lisp/emacs-lisp/edebug.el (edebug--called-interactively-skip): New fun.
(called-interactively-p-functions): Use it.
* lisp/allout.el (allout-called-interactively-p): Don't assume
called-interactively-p is a subr.
* src/eval.c (Finteractive_p, Fcalled_interactively_p, interactive_p): Remove.
(syms_of_eval): Remove corresponding defsubr.
* src/bytecode.c (exec_byte_code): `interactive-p' is now a Lisp function.
* test/automated/advice-tests.el (advice-tests--data): Remove.
(advice-tests): Move the tests directly here instead.
Add called-interactively-p tests.
Diffstat (limited to 'src/bytecode.c')
| -rw-r--r-- | src/bytecode.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/bytecode.c b/src/bytecode.c index 648813aed86..3267c7c8c76 100644 --- a/src/bytecode.c +++ b/src/bytecode.c | |||
| @@ -1579,7 +1579,9 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth, | |||
| 1579 | NEXT; | 1579 | NEXT; |
| 1580 | 1580 | ||
| 1581 | CASE (Binteractive_p): /* Obsolete since 24.1. */ | 1581 | CASE (Binteractive_p): /* Obsolete since 24.1. */ |
| 1582 | PUSH (Finteractive_p ()); | 1582 | BEFORE_POTENTIAL_GC (); |
| 1583 | PUSH (call0 (intern ("interactive-p"))); | ||
| 1584 | AFTER_POTENTIAL_GC (); | ||
| 1583 | NEXT; | 1585 | NEXT; |
| 1584 | 1586 | ||
| 1585 | CASE (Bforward_char): | 1587 | CASE (Bforward_char): |