From: Juri Linkov Date: Tue, 21 May 2024 17:22:31 +0000 (+0300) Subject: Use read-from-minibuffer instead of read-string for dired-do-touch X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f68f7bf6fdcab50b1b2339ff8694cf655f2ea518;p=emacs.git Use read-from-minibuffer instead of read-string for dired-do-touch * lisp/dired-aux.el (dired-mark-read-string): Use read-from-minibuffer instead of read-string when op-symbol is 'touch', since it's more clear when read-from-minibuffer returns an empty string for RET, and it was used in dired-mark-read-string initially (bug#70725). (cherry picked from commit ce8e292bca84f29cea540e3e23e88ec7a5d1674e) --- diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index d5f2876c3ee..82b85d83498 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -649,10 +649,10 @@ Optional arg COLLECTION is a collection of possible completions, passed as the second arg to `completing-read'." (apply #'dired-mark-pop-up nil op-symbol files - (if (eq op-symbol 'touch) 'read-string 'completing-read) + (if (eq op-symbol 'touch) 'read-from-minibuffer 'completing-read) (format prompt (dired-mark-prompt arg files)) (if (eq op-symbol 'touch) - `(,initial nil ,default-value nil) + `(,initial nil nil nil ,default-value) `(,collection nil nil ,initial nil ,default-value nil))))