From: Eric S. Raymond <esr@snark.thyrsus.com>
Date: Mon, 12 May 2008 18:49:07 +0000 (+0000)
Subject: Tell (vc-expand-dirs) not to throw out explicitly specified files.
X-Git-Tag: emacs-pretest-23.0.90~5609
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=77c5055c7ba3682c2588dc7a15224f0da2723717;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e74ab626abd..b7e0ba2f06e 100644
--- 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 54a544b2dae..2795912dca1 100644
--- 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)