mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-30 19:53:09 +00:00
Code Issues Releases Activity

(vc-arch-workfile-version): Handle the empty-branch case.

Browse Source
This commit is contained in:
Stefan Monnier 2005-01-02 22:00:07 +00:00
parent 50292b6e31
commit 5e39b98a29
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,5 +1,7 @@
2005-01-02 Stefan <monnier@iro.umontreal.ca>
* vc-arch.el (vc-arch-workfile-version): Handle the empty-branch case.
* files.el (hack-local-variables): Fix last change.
2005-01-02 Jay Belanger <belanger@truman.edu>
@ -25,8 +27,7 @@
2005-01-01 Jay Belanger <belanger@truman.edu>
* calc/calc-yank.el (calc-edit-mode): Change default header.
(calc-edit-finish, calc-show-edit-buffer): Adjust to handle new
header.
(calc-edit-finish, calc-show-edit-buffer): Adjust to handle new header.
* calc/calc-store.el (calc-edit-variable): Change title to match new
header.
* calc/calc-prog.el (calc-edit-user-syntax): Change title in edit

4
lisp/vc-arch.el
View File

@ -1,6 +1,6 @@
;;; vc-arch.el --- VC backend for the Arch version-control system
;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004
;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
;; Free Software Foundation, Inc.
;; Author: FSF (see vc.el for full credits)
@ -270,7 +270,7 @@ Return non-nil if FILE is unchanged."
(defun vc-arch-workfile-version (file)
(let* ((root (expand-file-name "{arch}" (vc-arch-root file)))
(defbranch (vc-arch-default-version file)))
(when (and defbranch (string-match "\\`\\(.+@[^/\n]+\\)/\\(\\(\\(.*\\)--.*\\)--.*\\)\\'" defbranch))
(when (and defbranch (string-match "\\`\\(.+@[^/\n]+\\)/\\(\\(\\(.*\\)\\(--.*\\)?\\)--.*\\)\\'" defbranch))
(let* ((archive (match-string 1 defbranch))
(category (match-string 4 defbranch))
(branch (match-string 3 defbranch))