[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/11/16 04:55:48

Index: emulation/viper-cmd.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emulation/viper-cmd.el,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- emulation/viper-cmd.el      6 May 2008 03:27:59 -0000       1.77
+++ emulation/viper-cmd.el      16 Nov 2008 04:55:47 -0000      1.78
@@ -216,7 +216,7 @@
           (marker-position viper-insert-point))
       (setq viper-pre-command-point (marker-position viper-insert-point))))
 
-(defsubst viper-R-state-post-command-sentinel ()
+(defun viper-R-state-post-command-sentinel ()
   ;; Restoring cursor color is needed despite
   ;; viper-replace-state-pre-command-sentinel: When you jump to another buffer
   ;; in another frame, the pre-command hook won't change cursor color to
@@ -2762,9 +2762,10 @@
 (defun viper-next-line-carefully (arg)
   (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))
+         (next-line arg)))
     (error nil)))
 
 
@@ -3064,9 +3065,10 @@
        (com (viper-getCom arg)))
     (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))
+       (next-line val)))
     (if viper-ex-style-motion
        (if (and (eolp) (not (bolp))) (backward-char 1)))
     (setq this-command 'next-line)
@@ -3113,9 +3115,10 @@
        (com (viper-getCom arg)))
     (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))
+       (previous-line val)))
     (if viper-ex-style-motion
        (if (and (eolp) (not (bolp))) (backward-char 1)))
     (setq this-command 'previous-line)