summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@gnu.org>2011-10-30 11:39:11 +0800
committerChong Yidong <cyd@gnu.org>2011-10-30 11:39:11 +0800
commit30b65d9ce6d45ee306d090a6c23467f3e7075a4c (patch)
tree02503497696f11557d84063fc6278de67dbd8103
parent2d197ffbe2029b479802528eeaec714df4c8a8f6 (diff)
downloademacs-30b65d9ce6d45ee306d090a6c23467f3e7075a4c.tar.gz
* viper-cmd.el (viper-exec-change): Use push-mark not set-mark.
Fixes: debbugs:9810
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emulation/viper-cmd.el5
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 614094aa334..7f189e01550 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
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
split-window-above-each-other and split-window-side-by-side
respectively. All callers changed.
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 9d0eb6c0d14..359b3ff751d 100644
--- 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)