[Emacs-diffs] Changes to emacs/lisp/vc-arch.el [lexbind]

[Miles Bader]

Index: emacs/lisp/vc-arch.el
diff -c emacs/lisp/vc-arch.el:1.3.2.6 emacs/lisp/vc-arch.el:1.3.2.7
*** emacs/lisp/vc-arch.el:1.3.2.6       Tue Jul  6 10:23:35 2004
--- emacs/lisp/vc-arch.el       Thu Sep 16 00:12:21 2004
***************
*** 1,6 ****
  ;;; vc-arch.el --- VC backend for the Arch version-control system
  
! ;; Copyright (C) 1995,98,99,2000,01,02,03,2004  Free Software Foundation, Inc.
  
  ;; Author:      FSF (see vc.el for full credits)
  ;; Maintainer:  Stefan Monnier <address@hidden>
--- 1,7 ----
  ;;; vc-arch.el --- VC backend for the Arch version-control system
  
! ;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004
! ;;           Free Software Foundation, Inc.
  
  ;; Author:      FSF (see vc.el for full credits)
  ;; Maintainer:  Stefan Monnier <address@hidden>
***************
*** 253,261 ****
        (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_")))))
          (if (eobp)
              ;; ID not found.
              (if (equal (file-name-nondirectory sigfile)
--- 254,266 ----
        (with-current-buffer (find-file-noselect sigfile)
          (goto-char (point-min))
          (while (and (search-forward id nil 'move)
!                     (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)
***************
*** 303,309 ****
                   (or (not sealed) (eq (aref file 0) ?v))
                   (>= tmp rev-nb))
              (setq rev-nb tmp rev file)))
!       (concat defbranch "--" rev)))))
  
  
  (defcustom vc-arch-mode-line-rewrite
--- 308,316 ----
                   (or (not sealed) (eq (aref file 0) ?v))
                   (>= tmp rev-nb))
              (setq rev-nb tmp rev file)))
!       ;; Use "none-000" if the tree hasn't yet been committed on the
!       ;; default branch.  We'll then get "Arch:000[branch]" on the mode-line.
!       (concat defbranch "--" (or rev "none-000"))))))
  
  
  (defcustom vc-arch-mode-line-rewrite
***************
*** 418,422 ****
  
  (provide 'vc-arch)
  
! ;;; arch-tag: a35c7c1c-5237-429d-88ef-3d718fd2e704
  ;;; vc-arch.el ends here
--- 425,429 ----
  
  (provide 'vc-arch)
  
! ;; arch-tag: a35c7c1c-5237-429d-88ef-3d718fd2e704
  ;;; vc-arch.el ends here