summaryrefslogtreecommitdiff
path: root/lisp/vc-arch.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2004-09-08 22:15:34 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2004-09-08 22:15:34 +0000
commitc9cb3a267c2c62a26cafd10e3e06567853f56f8a (patch)
treef9b5ecf6cc2b2e2068ad96c124b5e8a4f99fc6d9 /lisp/vc-arch.el
parent5ee5cd10177c16cd5b65b97faf87f3ab1dfc9129 (diff)
downloademacs-c9cb3a267c2c62a26cafd10e3e06567853f56f8a.tar.gz
(vc-arch-state): Fix parsing for `names' method.
Diffstat (limited to 'lisp/vc-arch.el')
-rw-r--r--lisp/vc-arch.el10
1 files changed, 7 insertions, 3 deletions
diff --git a/lisp/vc-arch.el b/lisp/vc-arch.el
index 2cadfdc299f..c4c484a9347 100644
--- a/lisp/vc-arch.el
+++ b/lisp/vc-arch.el
@@ -254,9 +254,13 @@ Return non-nil if FILE is unchanged."
(with-current-buffer (find-file-noselect sigfile)
(goto-char (point-min))
(while (and (search-forward id nil 'move)
- (progn (goto-char (- (match-beginning 0) 2))
- ;; Ignore E_ entries used for foo.id files.
- (or (not (bolp)) (looking-at "E_")))))
+ (save-excursion
+ (goto-char (- (match-beginning 0) 2))
+ ;; For `names', the lines start with `?./foo/bar'.
+ ;; For others there's 2 chars before the ./foo/bar.
+ (or (not (or (bolp) (looking-at "\n?")))
+ ;; Ignore E_ entries used for foo.id files.
+ (looking-at "E_")))))
(if (eobp)
;; ID not found.
(if (equal (file-name-nondirectory sigfile)