# HG changeset patch # User Deepak Goel # Date 1196965093 0 # Node ID 1a8ec74a74f385387e89585f44a06d0e06b5b686 # Parent 9c91533a901a32dfb987736533eaafa4921029bc Fix buggy calls to `error'. diff -r 9c91533a901a -r 1a8ec74a74f3 lisp/ChangeLog --- a/lisp/ChangeLog Thu Dec 06 18:13:53 2007 +0000 +++ b/lisp/ChangeLog Thu Dec 06 18:18:13 2007 +0000 @@ -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 -r 9c91533a901a -r 1a8ec74a74f3 lisp/mail/feedmail.el --- a/lisp/mail/feedmail.el Thu Dec 06 18:13:53 2007 +0000 +++ b/lisp/mail/feedmail.el Thu Dec 06 18:18:13 2007 +0000 @@ -1922,7 +1922,7 @@ ;; 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 -r 9c91533a901a -r 1a8ec74a74f3 lisp/mail/rmailout.el --- a/lisp/mail/rmailout.el Thu Dec 06 18:13:53 2007 +0000 +++ b/lisp/mail/rmailout.el Thu Dec 06 18:18:13 2007 +0000 @@ -380,7 +380,7 @@ (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 -r 9c91533a901a -r 1a8ec74a74f3 lisp/mail/uce.el --- a/lisp/mail/uce.el Thu Dec 06 18:13:53 2007 +0000 +++ b/lisp/mail/uce.el Thu Dec 06 18:18:13 2007 +0000 @@ -239,7 +239,7 @@ (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