Fix 'called-interactively-p'

diff --git a/lisp/subr.el b/lisp/subr.el
index 403177f048edf812eced3675dabe7bd523c58f57..30da836e90c1fa88477a525a23fbb94440ed6c61 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -6077,7 +6077,7 @@ command is called from a keyboard macro?"
       ;; Now `frame' should be "the function from which we were called".
       (pcase (cons frame nextframe)
         ;; No subr calls `interactive-p', so we can rule that out.
-        (`((,_ ,(pred (compf subr-primitive-p indirect-function)) . ,_) . ,_) nil)
+        (`((,_ ,(pred (lambda (f) (subr-primitive-p (indirect-function f)))) . ,_) . ,_) nil)
         ;; In case #<subr funcall-interactively> without going through the
         ;; `funcall-interactively' symbol (bug#3984).
         (`(,_ . (t ,(pred (lambda (f)