From 23ba2705e22b89154ef7cbb0595419732080b94c Mon Sep 17 00:00:00 2001
From: Stefan Monnier
Date: Mon, 19 Nov 2012 23:24:09 -0500
Subject: 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.

---
 src/bytecode.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/bytecode.c')

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,
 	  NEXT;
 
 	CASE (Binteractive_p):	/* Obsolete since 24.1.  */
-	  PUSH (Finteractive_p ());
+	  BEFORE_POTENTIAL_GC ();
+	  PUSH (call0 (intern ("interactive-p")));
+	  AFTER_POTENTIAL_GC ();
 	  NEXT;
 
 	CASE (Bforward_char):
-- 
cgit v1.2.1