From: Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
Date: Tue, 11 Feb 2020 22:24:24 +0000 (+0200)
Subject: Make sure not to mark directories
X-Git-Tag: emacs-27.0.90~59
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2b12c2b6f22187536f54f32b11589bf5f21c1f09;p=emacs.git

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 0c293526eda..033cb27e33e 100644
--- 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))