Fix buggy calls to `error'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1f36c70890069f27315922556ffa7ed96d03de97..3c3c5b8aa4591052338eb750a4a5887a1e071317 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2007-12-06  D. Goel  <deego3@gmail.com>
 
+       * mail/uce.el (uce-reply-to-uce): Ditto.
+
+       * mail/rmailout.el (rmail-output): Ditto.
+
+       * mail/feedmail.el (feedmail-dump-message-to-queue): Ditto.
+
        * whitespace.el (whitespace-write-file-hook): Ditto.
 
        * wdired.el (wdired-check-kill-buffer): Ditto.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 27b3a1586b79250fb02e7d0d4b4fb4956b6d7df7..74b01dbe94ae4f083bc65f5bfca967b53c95ba0f 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,6 @@
 2007-12-06  D. Goel  <deego3@gmail.com>
 
+       * pop3.el (pop3-read-response): Ditto.
 
        * gnus-art.el (article-make-date-line): Fix buggy call to `error'.
        * gnus-start.el (gnus-load): Ditto.

diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index d152c2480ad167bcbcaf0ac9fe8527f4298d38b1..a48e8bc6cfe2ab8ff3e0b0ff58617201b2523d77 100644 (file)
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -314,7 +314,7 @@ Return the response string if optional second argument is non-nil."
       (setq match-end (point))
       (goto-char pop3-read-point)
       (if (looking-at "-ERR")
-         (error (buffer-substring (point) (- match-end 2)))
+         (error "%s" (buffer-substring (point) (- match-end 2)))
        (if (not (looking-at "+OK"))
            (progn (setq pop3-read-point match-end) nil)
          (setq pop3-read-point match-end)

diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index e75387f48ac0534541fa4b993a1e5de00bcc8c00..7fb40baa7c8df412d7a1af5e2190dae3f5468650 100644 (file)
--- 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 "%s" (concat "FQM: Message not queued; trouble with directory " queue-directory)))
   (let ((filename)
        (is-fqm)
        (is-in-this-dir)

diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index 1e9f8379b7b9d222f66728e94d88b44a01336d9e..234277320ad6753703d731df23d62ae5da7a904b 100644 (file)
--- 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 5a4e01ae9fc3cfc5bdf211034e5177bbe914e3e4..549339930683d4ca14fe422ab31154c9654b2c8c 100644 (file)
--- 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 "%s" (concat "No buffer " message-buffer ", cannot find UCE")))
     (switch-to-buffer message-buffer)
     ;; We need the message with headers pruned.
     (if full-header-p