Tell (vc-expand-dirs) not to throw out explicitly specified files.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e74ab626abdde13e6afe8424d39f85686b3ec52a..b7e0ba2f06e953b2342116c4afbdcd56420198ec 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-12  Eric S. Raymond  <esr@snark.thyrsus.com>
+
+       * vc.el (vc-expand-dirs): Stop this function from tossing out 
+       explicitlt specified files.
+
 2008-05-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * smerge-mode.el (smerge-apply-resolution-patch): Don't pass nil

diff --git a/lisp/vc.el b/lisp/vc.el
index 54a544b2daee61dd47c0feaee683e7d8ade559d7..2795912dca1d4debc674dff502e595218016f32a 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -973,11 +973,13 @@ be registered."
 
 (defun vc-expand-dirs (file-or-dir-list)
   "Expands directories in a file list specification.
-Only files already under version control are noticed."
+Within directories, only files already under version control are noticed."
   (let ((flattened '()))
     (dolist (node file-or-dir-list)
-      (vc-file-tree-walk
-       node (lambda (f) (when (vc-backend f) (push f flattened)))))
+      (if (file-directory-p node)
+         (vc-file-tree-walk
+          node (lambda (f) (when (vc-backend f) (push f flattened)))))
+      (push node flattened))
     (nreverse flattened)))
 
 (defun vc-deduce-fileset (&optional observer)