Commit 3d300447 authored by Glenn Morris's avatar Glenn Morris
Browse files

* lisp/mail/rmailout.el (rmail-output-read-file-name): Trap errors

in rmail-output-file-alist elements, and report them.
parent 4ce60d2e
2012-08-20 Glenn Morris <rgm@gnu.org>
* mail/rmailout.el (rmail-output-read-file-name):
Trap and report errors in rmail-output-file-alist elements.
* font-lock.el (font-lock-add-keywords): Doc fix (quote face names
since most non-font-lock faces are not also variables).
......
......@@ -74,13 +74,21 @@ This uses `rmail-output-file-alist'."
(widen)
(narrow-to-region beg end)
(let ((tail rmail-output-file-alist)
answer)
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)
;; FIXME trap and report any errors.
(setq answer (eval (cdar tail))))
(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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment