From 77c5055c7ba3682c2588dc7a15224f0da2723717 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Mon, 12 May 2008 18:49:07 +0000 Subject: [PATCH] Tell (vc-expand-dirs) not to throw out explicitly specified files. --- lisp/ChangeLog | 5 +++++ lisp/vc.el | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e74ab626ab..b7e0ba2f06 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-05-12 Eric S. Raymond + + * vc.el (vc-expand-dirs): Stop this function from tossing out + explicitlt specified files. + 2008-05-12 Stefan Monnier * smerge-mode.el (smerge-apply-resolution-patch): Don't pass nil diff --git a/lisp/vc.el b/lisp/vc.el index 54a544b2da..2795912dca 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) -- 2.20.1