Add file name and its extension to suggestions in dired-mark-files-regexp

* lisp/dired.el (dired-mark-files-regexp): Add file name
and its extension to the list of suggested defaults.  (Bug#25578)

diff --git a/lisp/dired.el b/lisp/dired.el
index 2733372eb7b0575273c0b8a236d77dcc8f7f7054..8396652d50b2e50b40d1084243524c0b9172195c 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3361,7 +3361,14 @@ object files--just `.o' will mark more than you might think."
   (interactive
    (list (read-regexp (concat (if current-prefix-arg "Unmark" "Mark")
                               " files (regexp): ")
-                      nil 'dired-regexp-history)
+                      ;; Add more suggestions into the default list
+                      (cons nil (list (dired-get-filename t t)
+                                      (and (dired-get-filename nil t)
+                                           (concat (regexp-quote
+                                                    (file-name-extension
+                                                     (dired-get-filename nil t) t))
+                                                   "\\'"))))
+                      'dired-regexp-history)
         (if current-prefix-arg ?\040)))
   (let ((dired-marker-char (or marker-char dired-marker-char)))
     (dired-mark-if