diff options
| -rw-r--r-- | doc/misc/dired-x.texi | 6 | ||||
| -rw-r--r-- | lisp/dired-x.el | 38 |
2 files changed, 31 insertions, 13 deletions
diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi index 2391852ca0f..db01896095c 100644 --- a/doc/misc/dired-x.texi +++ b/doc/misc/dired-x.texi @@ -710,8 +710,10 @@ variable @code{window-min-height}. @findex dired-mark-extension Mark all files with a certain extension for use in later commands. A @samp{.} is not automatically prepended to the string entered, you must type it -explicitly. If invoked with a prefix argument, this command asks for -a character to use as the marker. +explicitly. +If invoked with prefix argument @kbd{C-u}, this command unmark files instead. +If called with the @kbd{C-u C-u} prefix, asks for a character to use +as the marker, and marks files with it. When called from Lisp, @var{extension} may also be a list of extensions and an optional argument @var{marker-char} specifies the marker used. diff --git a/lisp/dired-x.el b/lisp/dired-x.el index 7d73c42befb..83139057659 100644 --- a/lisp/dired-x.el +++ b/lisp/dired-x.el @@ -334,17 +334,27 @@ See also the functions: A `.' is *not* automatically prepended to the string entered. EXTENSION may also be a list of extensions instead of a single one. Optional MARKER-CHAR is marker to use. -Interactively, ask for EXTENSION, and if invoked with a prefix -argument, for MARKER-CHAR as well." +Interactively, ask for EXTENSION. +Prefixed with one C-u, unmark files instead. +Prefixed with two C-u's, prompt for MARKER-CHAR and mark files with it." (interactive - (list (read-string "Marking extension: ") - (and current-prefix-arg - (let* ((dflt (char-to-string dired-marker-char)) - (input (read-string - (format - "Marker character to use (default %s): " dflt) - nil nil dflt))) - (aref input 0))))) + (let ((suffix + (read-string (format "%s extension: " + (if (equal current-prefix-arg '(4)) + "UNmarking" + "Marking")))) + (marker + (pcase current-prefix-arg + ('(4) ?\s) + ('(16) + (let* ((dflt (char-to-string dired-marker-char)) + (input (read-string + (format + "Marker character to use (default %s): " dflt) + nil nil dflt))) + (aref input 0))) + (_ dired-marker-char)))) + (list suffix marker))) (or (listp extension) (setq extension (list extension))) (dired-mark-files-regexp @@ -1470,7 +1480,13 @@ refer at all to the underlying file system. Contrast this with ;; (string-match "foo" sym) into which a user would soon fall. ;; Give `equal' instead of `=' in the example, as this works on ;; integers and strings. - (interactive "xMark if (lisp expr): \nP") + (interactive + (list (read--expression + (format "%s if (lisp expr): " + (if current-prefix-arg + "UNmark" + "Mark"))) + current-prefix-arg)) (message "%s" predicate) (let ((dired-marker-char (if unflag-p ?\040 dired-marker-char)) inode s mode nlink uid gid size time name sym) |