* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.

[bpt/emacs.git] / lisp / emulation / viper-cmd.el

diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 88af961..5e13edb 100644 (file)
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -834,7 +834,7 @@ 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
-                   viper-emacs-p
+                   (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
@@ -861,7 +861,7 @@ Vi's prefix argument will be used.  Otherwise, the prefix argument passed to
                                    (1- (length quail-current-str)))))
                 ))
              ((and viper-special-input-method
-                   viper-xemacs-p
+                   (featurep 'xemacs)
                    (fboundp 'quail-start-translation))
               ;; same as above but for XEmacs, which doesn't have
               ;; quail-input-method
@@ -893,7 +893,7 @@ Vi's prefix argument will be used.  Otherwise, the prefix argument passed to
              (t
               ;;(setq ch (read-char-exclusive))
               (setq ch (aref (read-key-sequence nil) 0))
-              (if viper-xemacs-p
+              (if (featurep 'xemacs)
                   (setq ch (event-to-character ch)))
               ;; replace ^M with the newline
               (if (eq ch ?\C-m) (setq ch ?\n))
@@ -902,13 +902,13 @@ Vi's prefix argument will be used.  Otherwise, the prefix argument passed to
                   (progn
                     ;;(setq ch (read-char-exclusive))
                     (setq ch (aref (read-key-sequence nil) 0))
-                    (if viper-xemacs-p
+                    (if (featurep 'xemacs)
                         (setq ch (event-to-character ch))))
                 )
               (insert ch))
              )
        (setq last-command-event
-             (viper-copy-event (if viper-xemacs-p
+             (viper-copy-event (if (featurep 'xemacs)
                                    (character-to-event ch) ch)))
        ) ; let
     (error nil)
@@ -1080,10 +1080,10 @@ as a Meta key and any number of multiple escapes is allowed."
                         ;; and return ESC as the key-sequence
                         (viper-set-unread-command-events (viper-subseq keyseq 1))
                         (setq last-input-event event
-                              keyseq (if viper-emacs-p
+                              keyseq (if (featurep 'emacs)
                                          "\e"
                                        (vector (character-to-event ?\e)))))
-                       ((and viper-xemacs-p
+                       ((and (featurep 'xemacs)
                              (key-press-event-p first-key)
                              (equal '(meta) key-mod))
                         (viper-set-unread-command-events
@@ -1320,7 +1320,7 @@ as a Meta key and any number of multiple escapes is allowed."
          (setq last-command-char char)
          (setq last-command-event
                (viper-copy-event
-                (if viper-xemacs-p (character-to-event char) char)))
+                (if (featurep 'xemacs) (character-to-event char) char)))
          (condition-case err
              (funcall cmd-to-exec-at-end cmd-info)
            (error
@@ -2791,7 +2791,7 @@ On reaching beginning of line, stop and signal error."
 (defun viper-next-line-carefully (arg)
   (condition-case nil
       ;; do not use forward-line! need to keep column
-      (next-line arg)
+      (with-no-warnings (next-line arg))
     (error nil)))
 
 
@@ -3091,7 +3091,7 @@ On reaching beginning of line, stop and signal error."
        (com (viper-getCom arg)))
     (if com (viper-move-marker-locally 'viper-com-point (point)))
     ;; do not use forward-line! need to keep column
-    (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)
@@ -3135,7 +3135,7 @@ If point is on a widget or a button, simulate clicking on that widget/button."
        (com (viper-getCom arg)))
     (if com (viper-move-marker-locally 'viper-com-point (point)))
     ;; do not use forward-line! need to keep column
-    (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)