* viper-cmd.el (viper-change-state): Use

	viper-ESC-moves-cursor-back to decide whether to move the cursor
	back.

2 files changed, 23 insertions, 15 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6c06499a374..daaa7a408d8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+1999-12-04  Michael Kifer  <kifer@cs.sunysb.edu>
+
+        * viper-cmd.el (viper-change-state): Use
+        viper-ESC-moves-cursor-back to decide whether to move the cursor
+        back.
+        
 1999-12-03  Kenichi Handa  <handa@mule.m17n.org>
 
         * international/mule-util.el (truncate-string-to-width): Docsting
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 78ed5e5d53c..90f17223ec3 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -224,6 +224,22 @@
                  (control n) (control p) (control f) (control b)))
       (viper-restore-cursor-color 'after-replace-mode)))
 
+
+;; Make sure we don't delete more than needed.
+;; This is executed at viper-last-posn-in-replace-region
+(defsubst viper-trim-replace-chars-to-delete-if-necessary ()
+  (setq viper-replace-chars-to-delete
+        (max 0
+             (min viper-replace-chars-to-delete
+                  ;; Don't delete more than to the end of repl overlay
+                  (viper-chars-in-region
+                   (viper-replace-end) viper-last-posn-in-replace-region)
+                  ;; point is viper-last-posn-in-replace-region now
+                  ;; So, this limits deletion to the end of line
+                  (viper-chars-in-region (point) (viper-line-pos 'end))
+                  ))))
+
+
 (defun viper-replace-state-post-command-sentinel ()
   ;; Restoring cursor color is needed despite
   ;; viper-replace-state-pre-command-sentinel: When one jumps to another buffer
@@ -316,7 +332,7 @@
                     (viper-push-onto-ring viper-last-insertion
                                           'viper-insertion-ring))
 
-                (if viper-ex-style-editing
+                (if viper-ESC-moves-cursor-back
                     (or (bolp) (backward-char 1))))
                ))
 
@@ -2235,20 +2251,6 @@ problems."
 
       )))
 
-;; Make sure we don't delete more than needed.
-;; This is executed at viper-last-posn-in-replace-region
-(defsubst viper-trim-replace-chars-to-delete-if-necessary ()
-  (setq viper-replace-chars-to-delete
-        (max 0
-             (min viper-replace-chars-to-delete
-                  ;; Don't delete more than to the end of repl overlay
-                  (viper-chars-in-region
-                   (viper-replace-end) viper-last-posn-in-replace-region)
-                  ;; point is viper-last-posn-in-replace-region now
-                  ;; So, this limits deletion to the end of line
-                  (viper-chars-in-region (point) (viper-line-pos 'end))
-                  ))))
-
 
 ;; Delete stuff between viper-last-posn-in-replace-region and the end of
 ;; viper-replace-overlay-marker, if viper-last-posn-in-replace-region is within