Make sure not to mark directories

* lisp/vc/vc-dir.el (vc-dir-mark-all-files):
Make sure not to mark directories (bug#37182).

diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 0c293526eda112dbbee3a95e5ba085c43d7abcfe..033cb27e33e08fee8fc86750c8d18e039064f86b 100644 (file)
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -649,7 +649,7 @@ line."
 
 (defun vc-dir-mark-all-files (arg)
   "Mark all files with the same state as the current one.
-With a prefix argument mark all files.
+With a prefix argument mark all files (not directories).
 If the current entry is a directory, mark all child files.
 
 The commands operate on files that are on the same state.
@@ -670,7 +670,8 @@ share the same state."
         vc-ewoc)
        (ewoc-map
         (lambda (filearg)
-          (unless (vc-dir-fileinfo->marked filearg)
+          (unless (or (vc-dir-fileinfo->directory filearg)
+                       (vc-dir-fileinfo->marked filearg))
             (setf (vc-dir-fileinfo->marked filearg) t)
             t))
         vc-ewoc))