aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2024-05-21 20:22:31 +0300
committerJuri Linkov2024-05-21 20:22:31 +0300
commitce8e292bca84f29cea540e3e23e88ec7a5d1674e (patch)
tree15ddfadb40246b514b7472e9d55b9b986891802f
parent9aeb4872d473695b75a27184b7e90868c15242c9 (diff)
downloademacs-ce8e292bca84f29cea540e3e23e88ec7a5d1674e.tar.gz
emacs-ce8e292bca84f29cea540e3e23e88ec7a5d1674e.zip
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).
-rw-r--r--lisp/dired-aux.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index b5eea4c74f6..22c6881ae35 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -660,10 +660,10 @@ Optional arg COLLECTION is a collection of possible completions,
660passed as the second arg to `completing-read'." 660passed as the second arg to `completing-read'."
661 (apply #'dired-mark-pop-up 661 (apply #'dired-mark-pop-up
662 nil op-symbol files 662 nil op-symbol files
663 (if (eq op-symbol 'touch) 'read-string 'completing-read) 663 (if (eq op-symbol 'touch) 'read-from-minibuffer 'completing-read)
664 (format prompt (dired-mark-prompt arg files)) 664 (format prompt (dired-mark-prompt arg files))
665 (if (eq op-symbol 'touch) 665 (if (eq op-symbol 'touch)
666 `(,initial nil ,default-value nil) 666 `(,initial nil nil nil ,default-value)
667 `(,collection nil nil ,initial nil ,default-value nil)))) 667 `(,collection nil nil ,initial nil ,default-value nil))))
668 668
669 669