From: Stefan Monnier Date: Wed, 8 Sep 2004 22:15:34 +0000 (+0000) Subject: (vc-arch-state): Fix parsing for `names' method. X-Git-Tag: ttn-vms-21-2-B4~4982 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c9cb3a267c2c62a26cafd10e3e06567853f56f8a;p=emacs.git (vc-arch-state): Fix parsing for `names' method. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c3eb1a5b7b8..7a1ad562b76 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2004-09-08 Stefan + + * vc-arch.el (vc-arch-state): Fix parsing for `names' method. + 2004-09-08 Kim F. Storm * emulation/cua-rect.el (cua--highlight-rectangle): Fix last @@ -66,6 +70,9 @@ 2004-09-07 Stefan + * 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 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)