(vc-arch-workfile-version): Don't burp if the patch-log directory is missing.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9f5fae1590780c1e109d579a25241672ee4f96c6..a0ba6ba22ecc018ee2547802fd25eefc5e29ebe2 100644 (file)
--- 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 e32fc474d949147f046236cd074012d2f4b30dfa..70dbdcc85f268881a96632085df82ae4c2704c1c 100644 (file)
--- 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)