aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1993-03-07 07:44:46 +0000
committerRichard M. Stallman1993-03-07 07:44:46 +0000
commitcfadef630685eada328ba02e2348b3baffe59312 (patch)
treec2c3fcab924488b10e14cd9dfde43e69056c8269
parent53e5a4e8a4f97bcd9907f6cebb0ba2468b9e5ba8 (diff)
downloademacs-cfadef630685eada328ba02e2348b3baffe59312.tar.gz
emacs-cfadef630685eada328ba02e2348b3baffe59312.zip
(vc-revert-buffer1): Use mark-marker; don't alter mark-active.
-rw-r--r--lisp/vc.el8
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/vc.el b/lisp/vc.el
index 62d4a8869ab..b9e52ba069e 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -5,7 +5,7 @@
5;; Author: Eric S. Raymond <esr@snark.thyrsus.com> 5;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
6;; Version: 4.0 6;; Version: 4.0
7 7
8;; $Id: vc.el,v 1.19 1992/12/12 15:22:26 jimb Exp jimb $ 8;; $Id: vc.el,v 1.20 1993/02/22 14:17:16 jimb Exp rms $
9 9
10;; This file is part of GNU Emacs. 10;; This file is part of GNU Emacs.
11 11
@@ -229,7 +229,11 @@ the master name of FILE; this is appended to an optional list of FLAGS."
229 (interactive "P") 229 (interactive "P")
230 (widen) 230 (widen)
231 (let ((point-context (vc-position-context (point))) 231 (let ((point-context (vc-position-context (point)))
232 (mark-context (if (mark) (vc-position-context (mark))))) 232 ;; Use mark-marker to avoid confusion in transient-mark-mode.
233 (mark-context (if (eq (marker-buffer (mark-marker)) (current-buffer))
234 (vc-position-context (mark-marker))))
235 ;; Make the right thing happen in transient-mark-mode.
236 (mark-active nil))
233 (revert-buffer arg no-confirm) 237 (revert-buffer arg no-confirm)
234 (let ((new-point (vc-find-position-by-context point-context))) 238 (let ((new-point (vc-find-position-by-context point-context)))
235 (if new-point (goto-char new-point))) 239 (if new-point (goto-char new-point)))