[Emacs-diffs] master 4cfd2a2: * lisp/emulation/viper.el (viper-set-hooks): Replace obsolete func.

[Glenn Morris]

branch: master
commit 4cfd2a2a92e2890af76bcd8375f966ce67ef2482
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    * lisp/emulation/viper.el (viper-set-hooks): Replace obsolete func.
---
 lisp/emulation/viper.el | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index c8eca30..8604020 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -937,8 +937,13 @@ Two differences:
     (if (and (eq viper-current-state 'vi-state)
             ;; Do not use called-interactively-p here. XEmacs does not have it
             ;; and interactive-p is just fine.
-            ;; (called-interactively-p 'interactive))
-            (interactive-p))
+             (if (featurep 'xemacs)
+                 (interactive-p)
+               ;; Respect the spirit of the above comment, though it
+               ;; seems pointless, since XE doesn't have advice-add or
+               ;; lexical binding or any other of the newer features
+               ;; this file uses.
+               (called-interactively-p 'interactive)))
        (beep 1)
       (apply orig-fun args))))