From: Glenn Morris <rgm@gnu.org>
Date: Sat, 24 Mar 2018 00:55:51 +0000 (-0400)
Subject: * lisp/emulation/viper.el (viper-set-hooks): Replace obsolete func.
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=905bb9c03d10342a63fe8f4e0c5c1875665e6afe;p=emacs.git

* lisp/emulation/viper.el (viper-set-hooks): Replace obsolete func.
---

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))))