Mercurial > emacs
changeset 57026:992d9837a265
(vc-arch-state): Fix parsing for `names' method.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 08 Sep 2004 22:15:34 +0000 |
| parents | 862d0c555534 |
| children | 35ae3e1a2ffe |
| files | lisp/ChangeLog lisp/vc-arch.el |
| diffstat | 2 files changed, 14 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Sep 08 20:43:17 2004 +0000 +++ b/lisp/ChangeLog Wed Sep 08 22:15:34 2004 +0000 @@ -1,3 +1,7 @@ +2004-09-08 Stefan <monnier@iro.umontreal.ca> + + * vc-arch.el (vc-arch-state): Fix parsing for `names' method. + 2004-09-08 Kim F. Storm <storm@cua.dk> * emulation/cua-rect.el (cua--highlight-rectangle): Fix last @@ -66,6 +70,9 @@ 2004-09-07 Stefan <monnier@iro.umontreal.ca> + * 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)
--- a/lisp/vc-arch.el Wed Sep 08 20:43:17 2004 +0000 +++ b/lisp/vc-arch.el Wed Sep 08 22:15:34 2004 +0000 @@ -254,9 +254,13 @@ (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)