changeset 2041:ccb75415543a

(vc-revert-buffer1): Use mark-marker; don't alter mark-active.
author Richard M. Stallman <rms@gnu.org>
date Sun, 07 Mar 1993 07:44:46 +0000
parents aa926beb4caa
children bbf37b9a24af
files lisp/vc.el
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/vc.el	Sun Mar 07 07:35:57 1993 +0000
+++ b/lisp/vc.el	Sun Mar 07 07:44:46 1993 +0000
@@ -5,7 +5,7 @@
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Version: 4.0
 
-;;	$Id: vc.el,v 1.19 1992/12/12 15:22:26 jimb Exp jimb $	
+;;	$Id: vc.el,v 1.20 1993/02/22 14:17:16 jimb Exp rms $	
 
 ;; This file is part of GNU Emacs.
 
@@ -229,7 +229,11 @@
   (interactive "P")
   (widen)
   (let ((point-context (vc-position-context (point)))
-	(mark-context  (if (mark) (vc-position-context (mark)))))
+	;; Use mark-marker to avoid confusion in transient-mark-mode.
+	(mark-context  (if (eq (marker-buffer (mark-marker)) (current-buffer))
+			   (vc-position-context (mark-marker))))
+	;; Make the right thing happen in transient-mark-mode.
+	(mark-active nil))
     (revert-buffer arg no-confirm)
     (let ((new-point (vc-find-position-by-context point-context)))
       (if new-point (goto-char new-point)))