[Emacs-diffs] Changes to emacs/lisp/emulation/viper-cmd.el,v

[Michael Kifer]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Michael Kifer <kifer>   08/01/09 06:16:09

Index: emulation/viper-cmd.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emulation/viper-cmd.el,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- emulation/viper-cmd.el      8 Jan 2008 20:46:50 -0000       1.71
+++ emulation/viper-cmd.el      9 Jan 2008 06:16:05 -0000       1.72
@@ -2773,7 +2773,9 @@
 (defun viper-next-line-carefully (arg)
   (condition-case nil
       ;; do not use forward-line! need to keep column
+      (if (featurep 'emacs)
       (with-no-warnings (next-line arg))
+       (next-line arg))
     (error nil)))
 
 
@@ -3073,15 +3075,18 @@
        (com (viper-getCom arg)))
     (if com (viper-move-marker-locally 'viper-com-point (point)))
     ;; do not use forward-line! need to keep column
+    (if (featurep 'emacs)
     (with-no-warnings (next-line val))
+      (next-line val))
     (if viper-ex-style-motion
        (if (and (eolp) (not (bolp))) (backward-char 1)))
     (setq this-command 'next-line)
     (if com (viper-execute-com 'viper-next-line val com))))
 
-(declare-function widget-type "wid-edit" (widget))
-(declare-function widget-button-press "wid-edit" (pos &optional event))
-(declare-function viper-set-hooks "viper" ())
+;; declare-function is not defined in XEmacs
+;;(declare-function widget-type "wid-edit" (widget))
+;;(declare-function widget-button-press "wid-edit" (pos &optional event))
+;;(declare-function viper-set-hooks "viper" ())
 
 (defun viper-next-line-at-bol (arg)
   "Next line at beginning of line.
@@ -3120,7 +3125,9 @@
        (com (viper-getCom arg)))
     (if com (viper-move-marker-locally 'viper-com-point (point)))
     ;; do not use forward-line! need to keep column
+    (if (featurep 'emacs)
     (with-no-warnings (previous-line val))
+      (previous-line val))
     (if viper-ex-style-motion
        (if (and (eolp) (not (bolp))) (backward-char 1)))
     (setq this-command 'previous-line)