Mercurial > emacs
changeset 21212:73a8874d25ce
(vc-restore-buffer-context): Only try to restore mark if it is active.
| author | André Spiegel <spiegel@gnu.org> |
|---|---|
| date | Wed, 18 Mar 1998 13:25:00 +0000 |
| parents | 293254dae80a |
| children | 2816d2c192fb |
| files | lisp/vc.el |
| diffstat | 1 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/vc.el Wed Mar 18 06:11:03 1998 +0000 +++ b/lisp/vc.el Wed Mar 18 13:25:00 1998 +0000 @@ -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 @@ (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