dynwind fixes

[bpt/emacs.git] / lisp / mail / rmailout.el

diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index 5d50013..ff4cf71 100644 (file)
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -1,9 +1,9 @@
 ;;; rmailout.el --- "RMAIL" mail reader for Emacs: output message to a file
 
-;; Copyright (C) 1985, 1987, 1993-1994, 2001-2012
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1987, 1993-1994, 2001-2014 Free Software
+;; Foundation, Inc.
 
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
 ;; Package: rmail
 
@@ -61,27 +61,38 @@ The function `rmail-delete-unwanted-fields' uses this, ignoring case."
 Set `rmail-default-file' to this name as well as returning it.
 This uses `rmail-output-file-alist'."
   (let* ((default-file
-          (when rmail-output-file-alist
-            (or rmail-buffer (error "There is no Rmail buffer"))
-            (save-current-buffer
-              (set-buffer rmail-buffer)
-              (let ((beg (rmail-msgbeg rmail-current-message))
-                    (end (rmail-msgend rmail-current-message)))
-                (if (rmail-buffers-swapped-p) (set-buffer rmail-view-buffer))
-                (save-excursion
-                  (save-restriction
-                    (widen)
-                    (narrow-to-region beg end)
-                    (let ((tail rmail-output-file-alist)
-                          answer)
-                      ;; Suggest a file based on a pattern match.
-                      (while (and tail (not answer))
-                        (goto-char (point-min))
-                        (if (re-search-forward (caar tail) nil t)
-                            (setq answer (eval (cdar tail))))
-                        (setq tail (cdr tail)))
-                      ;; If no suggestion, use same file as last time.
-                      (or answer rmail-default-file))))))))
+          (or
+           (when rmail-output-file-alist
+             (or rmail-buffer (error "There is no Rmail buffer"))
+             (save-current-buffer
+               (set-buffer rmail-buffer)
+               (let ((beg (rmail-msgbeg rmail-current-message))
+                     (end (rmail-msgend rmail-current-message)))
+                 (if (rmail-buffers-swapped-p) (set-buffer rmail-view-buffer))
+                 (save-excursion
+                   (save-restriction
+                     (widen)
+                     (narrow-to-region beg end)
+                     (let ((tail rmail-output-file-alist)
+                           answer err)
+                       ;; Suggest a file based on a pattern match.
+                       (while (and tail (not answer))
+                         (goto-char (point-min))
+                         (if (re-search-forward (caar tail) nil t)
+                             (setq answer
+                                   (condition-case err
+                                       (eval (cdar tail))
+                                     (error
+                                      (display-warning
+                                       :error
+                                       (format "Error evaluating \
+`rmail-output-file-alist' element:\nregexp: %s\naction: %s\nerror: %S\n"
+                                               (caar tail) (cdar tail) err))
+                                      nil))))
+                         (setq tail (cdr tail)))
+                       answer))))))
+           ;; If no suggestion, use same file as last time.
+           rmail-default-file))
         (read-file
          (expand-file-name
           (read-file-name