diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
| commit | ec0a80cc283badc7f7fd5ef78512dde6d34b1355 (patch) | |
| tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /lisp/mail/rmailout.el | |
| parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
| parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
| download | emacs-25-merge.tar.gz | |
Merge emacs-25 into master (using imerge)emacs-25-merge
Diffstat (limited to 'lisp/mail/rmailout.el')
| -rw-r--r-- | lisp/mail/rmailout.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el index 1e770e6fea6..587d75f09b9 100644 --- a/lisp/mail/rmailout.el +++ b/lisp/mail/rmailout.el @@ -84,13 +84,14 @@ This uses `rmail-output-file-alist'." (eval (cdar tail)) (error (display-warning - :error + 'rmail-output (format-message "\ Error evaluating `rmail-output-file-alist' element: regexp: %s action: %s error: %S\n" - (caar tail) (cdar tail) err)) + (caar tail) (cdar tail) err) + :error) nil)))) (setq tail (cdr tail))) answer)))))) |