# HG changeset patch
# User Eric S. Raymond <esr@snark.thyrsus.com>
# Date 1210618147 0
# Node ID 9e19bca35d7fdc74200b92428bc274567a4c570d
# Parent  a69e407ec0dd259a3e914e305ff1ca8031e2d6cd
Tell (vc-expand-dirs) not to throw out explicitly specified files.

diff -r a69e407ec0dd -r 9e19bca35d7f lisp/ChangeLog
--- a/lisp/ChangeLog	Mon May 12 18:31:26 2008 +0000
+++ b/lisp/ChangeLog	Mon May 12 18:49:07 2008 +0000
@@ -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 -r a69e407ec0dd -r 9e19bca35d7f lisp/vc.el
--- a/lisp/vc.el	Mon May 12 18:31:26 2008 +0000
+++ b/lisp/vc.el	Mon May 12 18:49:07 2008 +0000
@@ -973,11 +973,13 @@
 
 (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)