2 files changed, 5 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f958b355c6f..f590dad8196 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/vc.el b/lisp/vc.el
index 0fd4fbb712c..41818576cb4 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -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 @@ be registered."
 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)