diff options
| author | Eric S. Raymond <esr@snark.thyrsus.com> | 2008-05-12 18:49:07 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@snark.thyrsus.com> | 2008-05-12 18:49:07 +0000 |
| commit | 77c5055c7ba3682c2588dc7a15224f0da2723717 (patch) | |
| tree | b25dbc9ba1f70a002f80a667f53d4e45513aa58c /lisp | |
| parent | 728bb8e020a1ac1480787e715e7297eaaf6fad26 (diff) | |
| download | emacs-77c5055c7ba3682c2588dc7a15224f0da2723717.tar.gz | |
Tell (vc-expand-dirs) not to throw out explicitly specified files.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc.el | 8 |
2 files changed, 10 insertions, 3 deletions
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) |