Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-300

5 files changed, 15 insertions, 10 deletions

diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index e75387f48ac..ab8611424db 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -1922,7 +1922,7 @@ mapped to mostly alphanumerics for safety."
       ;; progn to get nil result no matter what
       (progn (make-directory queue-directory t) nil)
       (file-accessible-directory-p queue-directory)
-      (error (concat "FQM: Message not queued; trouble with directory " queue-directory)))
+      (error "FQM: Message not queued; trouble with directory %s" queue-directory))
   (let ((filename)
         (is-fqm)
         (is-in-this-dir)
diff --git a/lisp/mail/hashcash.el b/lisp/mail/hashcash.el
index 22005ce957e..36cd17fe6fc 100644
--- a/lisp/mail/hashcash.el
+++ b/lisp/mail/hashcash.el
@@ -49,6 +49,9 @@
 
 ;;; Code:
 
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
+
 (defgroup hashcash nil
   "Hashcash configuration."
   :group 'mail)
@@ -112,13 +115,15 @@ For example, you may want to set this to '(\"-Z2\") to reduce header length."
 (require 'mail-utils)
 
 (eval-and-compile
- (if (fboundp 'point-at-bol)
-     (defalias 'hashcash-point-at-bol 'point-at-bol)
-   (defalias 'hashcash-point-at-bol 'line-beginning-position))
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
+
+  (if (fboundp 'point-at-bol)
+      (defalias 'hashcash-point-at-bol 'point-at-bol)
+    (defalias 'hashcash-point-at-bol 'line-beginning-position))
 
- (if (fboundp 'point-at-eol)
-     (defalias 'hashcash-point-at-eol 'point-at-eol)
-   (defalias 'hashcash-point-at-eol 'line-end-position)))
+  (if (fboundp 'point-at-eol)
+      (defalias 'hashcash-point-at-eol 'point-at-eol)
+    (defalias 'hashcash-point-at-eol 'line-end-position)))
 
 (defun hashcash-strip-quoted-names (addr)
   (setq addr (mail-strip-quoted-names addr))
diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el
index 24dd9ab0c35..0777c60a2b9 100644
--- a/lisp/mail/reporter.el
+++ b/lisp/mail/reporter.el
@@ -118,7 +118,7 @@ composed.")
   "Periodically output a status message."
   (if (zerop (% reporter-status-count 10))
       (progn
-        (message reporter-status-message)
+        (message "%s" reporter-status-message)
         (setq reporter-status-message (concat reporter-status-message "."))))
   (setq reporter-status-count (1+ reporter-status-count)))
 
diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index 1e9f8379b7b..234277320ad 100644
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -380,7 +380,7 @@ The optional fourth argument FROM-GNUS is set when called from GNUS."
                   (rmail-toggle-header))
               (if (and (> count 0) (not next-message-p))
                   (progn
-                    (error
+                    (error "%s"
                      (save-excursion
                        (set-buffer rmailbuf)
                        (format "Only %d message%s appended" num-appended
diff --git a/lisp/mail/uce.el b/lisp/mail/uce.el
index 5a4e01ae9fc..094cb03f861 100644
--- a/lisp/mail/uce.el
+++ b/lisp/mail/uce.el
@@ -239,7 +239,7 @@ address, and postmaster of the mail relay used."
         (full-header-p (and (eq uce-mail-reader 'rmail)
                             (not (rmail-msg-is-pruned)))))
     (or (get-buffer message-buffer)
-        (error (concat "No buffer " message-buffer ", cannot find UCE")))
+        (error "No buffer %s, cannot find UCE" message-buffer))
     (switch-to-buffer message-buffer)
     ;; We need the message with headers pruned.
     (if full-header-p