diff options
| author | Mattias Engdegård <mattiase@acm.org> | 2022-08-16 20:37:02 +0200 |
|---|---|---|
| committer | Mattias Engdegård <mattiase@acm.org> | 2022-08-16 20:44:50 +0200 |
| commit | 8517d1e9aaf098993c5999480a301f472ba05f1d (patch) | |
| tree | f78a0396f9a4b32d9f0c0bbaca237106d914a835 /lisp/dired.el | |
| parent | fb98c4a4060ee756af41dee7a23472219314d37a (diff) | |
| download | emacs-8517d1e9aaf098993c5999480a301f472ba05f1d.tar.gz | |
* lisp/dired.el (dired-mark-if): Evaluate MSG once to avoid warning.
Diffstat (limited to 'lisp/dired.el')
| -rw-r--r-- | lisp/dired.el | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/dired.el b/lisp/dired.el index f261f9f477a..10813e56dff 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -775,19 +775,20 @@ of the region if `dired-mark-region' is non-nil. Otherwise, operate on the whole buffer. Return value is the number of files marked, or nil if none were marked." - `(let ((inhibit-read-only t) count + `(let ((msg ,msg) + (inhibit-read-only t) count (use-region-p (dired-mark--region-use-p)) (beg (dired-mark--region-beginning)) (end (dired-mark--region-end))) (save-excursion (setq count 0) - (when ,msg + (when msg (message "%s %ss%s%s..." (cond ((eq dired-marker-char ?\s) "Unmarking") ((eq dired-del-marker dired-marker-char) "Flagging") (t "Marking")) - ,msg + msg (if (eq dired-del-marker dired-marker-char) " for deletion" "") @@ -802,9 +803,9 @@ Return value is the number of files marked, or nil if none were marked." (insert dired-marker-char) (setq count (1+ count)))) (forward-line 1)) - (when ,msg (message "%s %s%s %s%s%s" + (when msg (message "%s %s%s %s%s%s" count - ,msg + msg (dired-plural-s count) (if (eq dired-marker-char ?\s) "un" "") (if (eq dired-marker-char dired-del-marker) |