From 26b4a51d1e6ef277c93f0d385d76a0fa9af69e7f Mon Sep 17 00:00:00 2001 From: Deepak Goel Date: Thu, 6 Dec 2007 18:18:13 +0000 Subject: Fix buggy calls to `error'. --- lisp/ChangeLog | 6 ++++++ lisp/gnus/ChangeLog | 1 + lisp/gnus/pop3.el | 2 +- lisp/mail/feedmail.el | 2 +- lisp/mail/rmailout.el | 2 +- lisp/mail/uce.el | 2 +- 6 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1f36c70890..3c3c5b8aa4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,11 @@ 2007-12-06 D. Goel + * 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 27b3a1586b..74b01dbe94 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,5 +1,6 @@ 2007-12-06 D. Goel + * 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 d152c2480a..a48e8bc6cf 100644 --- 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 e75387f48a..7fb40baa7c 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 "%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 1e9f8379b7..234277320a 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 5a4e01ae9f..5493399306 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 "%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 -- cgit v1.2.3