Message format spec fixes (commit 6)

diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index 7c7265ac8c967ffdf06055aefe17c4abad6f73f7..d8740c036f2004baea7a93a611f9bc9288521c2e 100644 (file)
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -1943,7 +1943,7 @@ mapped to mostly alphanumerics for safety."
               (file-exists-p a-s-file-name)
               (delete-file a-s-file-name))))
     (if feedmail-queue-chatty
-       (progn (message (concat "FQM: Queued in " filename))
+       (progn (message "%s" (concat "FQM: Queued in " filename))
               (sit-for feedmail-queue-chatty-sit-for)))
     (if feedmail-queue-chatty
        (progn

diff --git a/lisp/mail/rmail-spam-filter.el b/lisp/mail/rmail-spam-filter.el
index 7be5146f722bec650b842923061499f567404fc4..525bcd4096b89de537ea41fb5a801c67125e4fba 100644 (file)
--- a/lisp/mail/rmail-spam-filter.el
+++ b/lisp/mail/rmail-spam-filter.el
@@ -449,10 +449,10 @@ it from rmail file.  Called for each new message retrieved by
     (if rsf-autosave-newly-added-definitions
        (progn
          (custom-save-all)
-         (message (concat "added subject \n <<< \n" message-subject
+         (message "%s" (concat "added subject \n <<< \n" message-subject
                           " \n >>> \n to list of spam definitions. \n"
                           "and saved the spam definitions to file.")))
-      (message (concat "added subject \n <<< \n" message-subject
+      (message "%s" (concat "added subject \n <<< \n" message-subject
                       " \n >>> \n to list of spam definitions. \n"
                       "Don't forget to save the spam definitions to file using the spam
                       menu"))
@@ -478,10 +478,10 @@ it from rmail file.  Called for each new message retrieved by
     (if rsf-autosave-newly-added-definitions
        (progn
          (custom-save-all)
-         (message (concat "added sender \n <<< \n" message-sender
+         (message "%s" (concat "added sender \n <<< \n" message-sender
                           " \n >>> \n to list of spam definitions. \n"
                           "and saved the spam definitions to file.")))
-      (message (concat "added sender \n <<< \n " message-sender
+      (message "%s" (concat "added sender \n <<< \n " message-sender
                       " \n >>> \n to list of spam definitions."
                       "Don't forget to save the spam definitions to file using the spam
                       menu"))
@@ -521,10 +521,10 @@ Added to spam definitions as a contents field."
          (if rsf-autosave-newly-added-definitions
              (progn
                (custom-save-all)
-               (message (concat "added highlighted text \n <<< \n" region-to-spam-list
+               (message "%s" (concat "added highlighted text \n <<< \n" region-to-spam-list
                                 " \n >>> \n to list of spam definitions. \n"
                                 "and saved the spam definitions to file.")))
-           (message (concat "added highlighted text \n <<< \n " region-to-spam-list
+           (message "%s" (concat "added highlighted text \n <<< \n " region-to-spam-list
                             " \n >>> \n to list of spam definitions."
                             "Don't forget to save the spam definitions to file using the
                             spam menu"))