* src/eval.c (Finteractive_p): Revert lexbind-merge mishap.

[bpt/emacs.git] / src / eval.c

diff --git a/src/eval.c b/src/eval.c
index 975204d..58fa92c 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -508,7 +508,7 @@ spec that specifies non-nil unconditionally (such as \"p\"); or (ii)
 use `called-interactively-p'.  */)
   (void)
 {
-  return interactive_p () ? Qt : Qnil;
+  return (INTERACTIVE && interactive_p ()) ? Qt : Qnil;
 }