From: André Spiegel <spiegel@gnu.org>
Date: Wed, 18 Mar 1998 13:25:00 +0000 (+0000)
Subject: (vc-restore-buffer-context): Only try to restore mark if it is active.
X-Git-Tag: emacs-20.3~1862
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=01e02ab3875e43f10a0cf286455831b62b6c325e;p=emacs.git

(vc-restore-buffer-context): Only try to restore mark if it is active.
---

diff --git a/lisp/vc.el b/lisp/vc.el
index 328c69b3270..ea2978b9a1a 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -5,7 +5,7 @@
 ;; Author:     Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de>
 
-;; $Id: vc.el,v 1.209 1998/02/27 18:44:14 spiegel Exp spiegel $
+;; $Id: vc.el,v 1.210 1998/03/08 10:03:50 spiegel Exp spiegel $
 
 ;; This file is part of GNU Emacs.
 
@@ -691,10 +691,11 @@ to an optional list of FLAGS."
     (if (not (vc-context-matches-p (point) point-context))
 	(let ((new-point (vc-find-position-by-context point-context)))
 	  (if new-point (goto-char new-point))))
-    (if mark-context
-	(if (not (vc-context-matches-p (mark) mark-context))
-	    (let ((new-mark (vc-find-position-by-context mark-context)))
-	      (if new-mark (set-mark new-mark)))))))
+    (and mark-active
+         mark-context
+         (not (vc-context-matches-p (mark) mark-context))
+         (let ((new-mark (vc-find-position-by-context mark-context)))
+           (if new-mark (set-mark new-mark))))))
 
 (defun vc-revert-buffer1 (&optional arg no-confirm)
   ;; Revert buffer, try to keep point and mark where user expects them in spite