diff options
| author | Stefan Monnier <[email protected]> | 2004-09-08 22:15:34 +0000 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2004-09-08 22:15:34 +0000 |
| commit | c9cb3a267c2c62a26cafd10e3e06567853f56f8a (patch) | |
| tree | f9b5ecf6cc2b2e2068ad96c124b5e8a4f99fc6d9 | |
| parent | 5ee5cd10177c16cd5b65b97faf87f3ab1dfc9129 (diff) | |
(vc-arch-state): Fix parsing for `names' method.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/vc-arch.el | 10 |
2 files changed, 14 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c3eb1a5b7b..7a1ad562b7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2004-09-08 Stefan <[email protected]> + + * vc-arch.el (vc-arch-state): Fix parsing for `names' method. + 2004-09-08 Kim F. Storm <[email protected]> * emulation/cua-rect.el (cua--highlight-rectangle): Fix last @@ -66,6 +70,9 @@ 2004-09-07 Stefan <[email protected]> + * term/xterm.el (function-key-map): Add bindings for C- and S- cursor + motion as seen on my Mac OS X xterms. + * newcomment.el (uncomment-region-default, comment-region-default): New functions extracted from uncomment-region and comment-region. (comment-region, comment-region-function, uncomment-region) diff --git a/lisp/vc-arch.el b/lisp/vc-arch.el index 2cadfdc299..c4c484a934 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) |