User: scop
Date: 06/07/04 22:11:51
Modified: packages/unsupported/scop/vc ChangeLog vc.el
Log:
Test for mark before using it.
Revision Changes Path
1.53 +2 -0 XEmacs/packages/unsupported/scop/vc/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- ChangeLog 2006/07/04 20:08:46 1.52
+++ ChangeLog 2006/07/04 20:11:50 1.53
@@ -1,5 +1,7 @@
2006-07-04 Ville Skyttä <scop(a)xemacs.org>
+ * vc.el (vc-restore-buffer-context): Test for mark before using.
+
* vc-xemacs.el: Comment update.
2006-06-28 Ville Skyttä <scop(a)xemacs.org>
1.30 +1 -1 XEmacs/packages/unsupported/scop/vc/vc.el
Index: vc.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc.el,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- vc.el 2006/06/28 12:02:16 1.29
+++ vc.el 2006/07/04 20:11:50 1.30
@@ -1148,7 +1148,7 @@ CONTEXT is that which `vc-buffer-context
(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))))
- (and ; mark-active ;; XEmacs: commented out
+ (and (mark) ;; XEmacs change: no mark-active
mark-context
(not (vc-context-matches-p (mark) mark-context))
(let ((new-mark (vc-find-position-by-context mark-context)))