Merge from trunk + rename the event. Not tested yet.

1 files changed, 3 insertions, 5 deletions

diff --git a/src/bytecode.c b/src/bytecode.c
index 648813aed86..4c5ac151de1 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -87,8 +87,6 @@ Lisp_Object Qbyte_code_meter;
 #endif /* BYTE_CODE_METER */
 
 
-Lisp_Object Qbytecode;
-
 /*  Byte codes: */
 
 #define BYTE_CODES                                                      \
@@ -1579,7 +1577,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):
@@ -1961,8 +1961,6 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
 void
 syms_of_bytecode (void)
 {
-  DEFSYM (Qbytecode, "byte-code");
-
   defsubr (&Sbyte_code);
 
 #ifdef BYTE_CODE_METER