# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1211846013 0
# Node ID 54121bb9b5ad6208113d594d7bfbd542a183ebd6
# Parent  f362398714d91611c1e32428f6e94bac80f62dfb
(Problems): Remove fixed issues.
(vc-expand-dirs): Avoid returning directories.

diff -r f362398714d9 -r 54121bb9b5ad lisp/ChangeLog
--- a/lisp/ChangeLog	Mon May 26 23:50:21 2008 +0000
+++ b/lisp/ChangeLog	Mon May 26 23:53:33 2008 +0000
@@ -1,6 +1,7 @@
 2008-05-26  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* vc.el (Problems): Remove fixed issues.
+	(vc-expand-dirs): Avoid returning directories.
 
 	* vc-dispatcher.el (vc-resynch-window): Fix mode-line updating.
 	(vc-dir-menu-map): Fix menu title for the menu bar and the popup menu.
diff -r f362398714d9 -r 54121bb9b5ad lisp/vc.el
--- a/lisp/vc.el	Mon May 26 23:50:21 2008 +0000
+++ b/lisp/vc.el	Mon May 26 23:53:33 2008 +0000
@@ -656,8 +656,6 @@
 ;;
 ;; - the CVS vc-dir display is now incorrect from some states.
 ;;
-;; - vc-dir is now broken for RCS and SCCS.
-;;
 ;; - the *vc-dir* buffer is not updated correctly anymore after VC
 ;;   operations that change the file state.
 ;;
@@ -988,10 +986,10 @@
 Within directories, only files already under version control are noticed."
   (let ((flattened '()))
     (dolist (node file-or-dir-list)
-      (if (file-directory-p node)
-	  (vc-file-tree-walk
-	   node (lambda (f) (when (vc-backend f) (push f flattened)))))
-      (push node flattened))
+      (when (file-directory-p node)
+	(vc-file-tree-walk
+	 node (lambda (f) (when (vc-backend f) (push f flattened)))))
+      (unless (file-directory-p node) (push node flattened)))
     (nreverse flattened)))
 
 (defun vc-derived-from-dir-mode (&optional buffer)