diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2004-10-17 23:01:25 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2004-10-17 23:01:25 +0000 |
| commit | bcabe045db2f9c08c2b0078e153ab458715e2ca1 (patch) | |
| tree | dfa2ecd426cbecb0fd8b0d3fc73c41bf2013b5ff | |
| parent | 1040d0412c2c041284248770e351c50feeebc4e7 (diff) | |
| download | emacs-bcabe045db2f9c08c2b0078e153ab458715e2ca1.tar.gz | |
(vc-arch-workfile-version): Don't burp if the patch-log directory is missing.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/vc-arch.el | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9f5fae15907..a0ba6ba22ec 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2004-10-17 Stefan Monnier <monnier@iro.umontreal.ca> + + * vc-arch.el (vc-arch-workfile-version): Don't burp if the patch-log + directory is missing. + 2004-10-17 John Paul Wallington <jpw@gnu.org> * ibuffer.el (ibuffer-default-display-maybe-show-predicates): @@ -26,7 +31,7 @@ 2004-10-17 Richard M. Stallman <rms@gnu.org> - * paths.el (news-directory): Renamed from news-path. Old name alias. + * paths.el (news-directory): Rename from news-path. Old name alias. (rmail-spool-directory): Use defvar. (sendmail-program): Use defcustom. (remote-shell-program): Use defcustom. diff --git a/lisp/vc-arch.el b/lisp/vc-arch.el index e32fc474d94..70dbdcc85f2 100644 --- a/lisp/vc-arch.el +++ b/lisp/vc-arch.el @@ -283,8 +283,8 @@ Return non-nil if FILE is unchanged." (setq logdir (expand-file-name version logdir)) (setq logdir (expand-file-name archive logdir)) (setq logdir (expand-file-name "patch-log" logdir)) - ;; Revision names go: base-0, patch-N, version-0, versionfix-N. - (dolist (file (directory-files logdir)) + (dolist (file (if (file-directory-p logdir) (directory-files logdir))) + ;; Revision names go: base-0, patch-N, version-0, versionfix-M. (when (and (eq (aref file 0) ?v) (not sealed)) (setq sealed t rev-nb 0)) (if (and (string-match "-\\([0-9]+\\)\\'" file) |