* viper-cmd.el (viper-exec-change): Use push-mark not set-mark.

Fixes: debbugs:9810

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 614094aa3341f7fce9ed1ad45d95f6cb08cb435c..7f189e01550f8a934d0462a299507414fc593433 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-30  Chong Yidong  <cyd@gnu.org>
+
+       * emulation/viper-cmd.el (viper-exec-change): Use push-mark
+       instead of set-mark (Bug#9810).
+
 2011-10-30  Chong Yidong  <cyd@gnu.org>
 
        * window.el (split-window-below, split-window-right): Rename from

diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 9d0eb6c0d140df3e08d5d33e97e2d4121bf84897..359b3ff751d2d85829bac72f5e0c90c676f005f9 100644 (file)
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -1387,7 +1387,7 @@ as a Meta key and any number of multiple escapes are allowed."
        (insert " ")(backward-char 1)))
   (if (= viper-com-point (point))
       (viper-forward-char-carefully))
-  (set-mark viper-com-point)
+  (push-mark viper-com-point)
   (if (eq m-com 'viper-next-line-at-bol)
       (viper-enlarge-region (mark t) (point)))
   (if (< (point) (mark t))
@@ -1396,8 +1396,7 @@ as a Meta key and any number of multiple escapes are allowed."
       (viper-backward-char-carefully)) ; give back the newline
   (if (eq viper-intermediate-command 'viper-repeat)
       (viper-change-subr (mark t) (point))
-    (viper-change (mark t) (point))
-    ))
+    (viper-change (mark t) (point))))
 
 ;; this is invoked by viper-substitute-line
 (defun viper-exec-Change (m-com com)