Remove more XEmacs compat code from viper-*.el

* lisp/emulation/viper-cmd.el (viper-special-read-and-insert-char)
(viper-next-line-carefully, viper-next-line)
(viper-previous-line): Ditto.

* lisp/emulation/viper-mous.el (viper-surrounding-word)
(viper-parse-mouse-key): Remove XEmacs compat code.

diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index bdb205ce7c8a2743a3ff48571e63d2e6179a771f..f193c4273b252df714384a782409790dee67df02 100644 (file)
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -789,7 +789,6 @@ Vi's prefix argument will be used.  Otherwise, the prefix argument passed to
            viper-emacs-kbd-minor-mode
            ch)
        (cond ((and viper-special-input-method
-                   (featurep 'emacs)
                    (fboundp 'quail-input-method))
               ;; (let ...) is used to restore unread-command-events to the
               ;; original state. We don't want anything left in there after
@@ -2594,9 +2593,8 @@ On reaching beginning of line, stop and signal error."
   (condition-case nil
       ;; do not use forward-line! need to keep column
       (let ((line-move-visual nil))
-       (if (featurep 'emacs)
-           (with-no-warnings (next-line arg))
-         (next-line arg)))
+       (with-no-warnings
+          (next-line arg)))
     (error nil)))
 
 
@@ -2886,9 +2884,8 @@ On reaching beginning of line, stop and signal error."
     (if com (viper-move-marker-locally 'viper-com-point (point)))
     ;; do not use forward-line! need to keep column
     (let ((line-move-visual nil))
-      (if (featurep 'emacs)
-         (with-no-warnings (next-line val))
-       (next-line val)))
+      (with-no-warnings
+        (next-line val)))
     (if viper-ex-style-motion
        (if (and (eolp) (not (bolp))) (backward-char 1)))
     (setq this-command 'next-line)
@@ -2934,9 +2931,8 @@ If point is on a widget or a button, simulate clicking on that widget/button."
     (if com (viper-move-marker-locally 'viper-com-point (point)))
     ;; do not use forward-line! need to keep column
     (let ((line-move-visual nil))
-      (if (featurep 'emacs)
-         (with-no-warnings (previous-line val))
-       (previous-line val)))
+      (with-no-warnings
+        (previous-line val)))
     (if viper-ex-style-motion
        (if (and (eolp) (not (bolp))) (backward-char 1)))
     (setq this-command 'previous-line)

diff --git a/lisp/emulation/viper-mous.el b/lisp/emulation/viper-mous.el
index e1f7c1643bd4084a24d6ea501671606dcae9afe6..e076e9888667f2d1c5aa6a78720536a3da56da3d 100644 (file)
--- a/lisp/emulation/viper-mous.el
+++ b/lisp/emulation/viper-mous.el
@@ -214,10 +214,8 @@ is ignored."
        ) ; if
      ;; XEmacs doesn't have set-text-properties, but there buffer-substring
      ;; doesn't return properties together with the string, so it's not needed.
-     (if (featurep 'emacs)
-        (set-text-properties 0 (length result) nil result))
-     result
-     ))
+     (set-text-properties 0 (length result) nil result)
+     result))
 
 
 (defun viper-mouse-click-get-word (click count click-count)
@@ -493,49 +491,27 @@ bindings in the Viper manual."
        ()
       (setq button-spec
            (cond ((memq 1 key)
-                  (if (featurep 'emacs)
-                      (if (eq 'up event-type)
-                          "mouse-1" "down-mouse-1")
-                    (if (eq 'up event-type)
-                        'button1up 'button1)))
+                  (if (eq 'up event-type)
+                      "mouse-1" "down-mouse-1"))
                  ((memq 2 key)
-                  (if (featurep 'emacs)
-                      (if (eq 'up event-type)
-                          "mouse-2" "down-mouse-2")
-                    (if (eq 'up event-type)
-                        'button2up 'button2)))
+                  (if (eq 'up event-type)
+                      "mouse-2" "down-mouse-2"))
                  ((memq 3 key)
-                  (if (featurep 'emacs)
-                      (if (eq 'up event-type)
-                          "mouse-3" "down-mouse-3")
-                    (if (eq 'up event-type)
-                        'button3up 'button3)))
+                  (if (eq 'up event-type)
+                      "mouse-3" "down-mouse-3"))
                  (t (error
                      "%S: invalid button number, %S" key-var key)))
            meta-spec
-           (if (memq 'meta key)
-               (if (featurep 'emacs) "M-" 'meta)
-             (if (featurep 'emacs) "" nil))
+           (if (memq 'meta key) "M-" "")
            shift-spec
-           (if (memq 'shift key)
-               (if (featurep 'emacs) "S-" 'shift)
-             (if (featurep 'emacs) "" nil))
+           (if (memq 'shift key) "S-" "")
            control-spec
-           (if (memq 'control key)
-               (if (featurep 'emacs) "C-" 'control)
-             (if (featurep 'emacs) "" nil)))
-
-      (setq key-spec (if (featurep 'emacs)
-                        (vector
-                         (intern
-                          (concat
-                           control-spec meta-spec shift-spec button-spec)))
-                      (vector
-                       (delq
-                        nil
-                        (list
-                         control-spec meta-spec shift-spec button-spec)))))
-      )))
+           (if (memq 'control key) "C-" ""))
+
+      (setq key-spec
+           (vector
+            (intern (concat control-spec meta-spec
+                             shift-spec button-spec)))))))
 
 (defun viper-unbind-mouse-search-key ()
   (if viper-mouse-up-search-key-parsed