From 8517d1e9aaf098993c5999480a301f472ba05f1d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mattias=20Engdeg=C3=A5rd?= Date: Tue, 16 Aug 2022 20:37:02 +0200 Subject: [PATCH] * lisp/dired.el (dired-mark-if): Evaluate MSG once to avoid warning. --- lisp/dired.el | 11 ++++++----- 1 file 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) -- 2.39.5