summaryrefslogtreecommitdiff
path: root/lisp/emulation
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-03-23 20:55:51 -0400
committerGlenn Morris <rgm@gnu.org>2018-03-23 20:55:51 -0400
commit4cfd2a2a92e2890af76bcd8375f966ce67ef2482 (patch)
tree0e25dc452d4c7e4524eb577e4cda9f633297a0ac /lisp/emulation
parent0ef87d60054fc1660413772cfb5598d2fb8a5fe5 (diff)
downloademacs-4cfd2a2a92e2890af76bcd8375f966ce67ef2482.tar.gz
* lisp/emulation/viper.el (viper-set-hooks): Replace obsolete func.
Diffstat (limited to 'lisp/emulation')
-rw-r--r--lisp/emulation/viper.el9
1 files changed, 7 insertions, 2 deletions
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index c8eca30e88b..8604020b987 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))))