diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-11-19 18:23:48 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-11-19 18:23:48 -0800 |
| commit | 7fb18e9ef9edb3b47cf463babe83922f9310a473 (patch) | |
| tree | 5d10a9ae4938ce7da8807e804422b2f9be6375dd /lisp/mail/rmailsum.el | |
| parent | d5a6b3badfc6e09c4bbda97f4ccf089952d57e5a (diff) | |
| download | emacs-7fb18e9ef9edb3b47cf463babe83922f9310a473.tar.gz | |
Small rmail fixes.
* lisp/mail/rmail.el (rmail-enable-mime-composing): Make it a defcustom.
(rmail-insert-mime-forwarded-message-function, rmail-mime-feature):
Doc fixes.
(rmail-decode-mime-charset): Mark as obsolete.
* lisp/mail/rmailsum.el (rmail-message-regexp-p-1):
* lisp/mail/rmail.el (rmail-search-message, rmail-forward, rmail-resend):
Before using mime functions, check they are set.
Fixes: debbugs:10077
Diffstat (limited to 'lisp/mail/rmailsum.el')
| -rw-r--r-- | lisp/mail/rmailsum.el | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el index a3f722443dc..e6a0a34f33b 100644 --- a/lisp/mail/rmailsum.el +++ b/lisp/mail/rmailsum.el @@ -342,10 +342,9 @@ Emacs will list the message in the summary." (defun rmail-message-regexp-p-1 (msg regexp) ;; Search functions can expect to start from the beginning. (narrow-to-region (point) (save-excursion (search-forward "\n\n") (point))) - (if rmail-enable-mime - (if rmail-search-mime-header-function - (funcall rmail-search-mime-header-function msg regexp (point)) - (error "You must set `rmail-search-mime-header-function'")) + (if (and rmail-enable-mime + rmail-search-mime-header-function) + (funcall rmail-search-mime-header-function msg regexp (point)) (re-search-forward regexp nil t))) ;;;###autoload |