From 6231483b7e13f1ad34b8aec560e7cc640059d6f9 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 6 Aug 2019 03:58:50 -0400 Subject: [PATCH] * lisp/mail/rfc2047.el (rfc2047-encodable-p): Don't require `message`. Use bound-and-true-p rather than requiring `message` to get message-posting-charset (since it defaults to nil anyway). --- lisp/mail/rfc2047.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lisp/mail/rfc2047.el b/lisp/mail/rfc2047.el index a02201ec323..188e5dc3969 100644 --- a/lisp/mail/rfc2047.el +++ b/lisp/mail/rfc2047.el @@ -325,7 +325,6 @@ Should be called narrowed to the head of the message." (defun rfc2047-encodable-p () "Return non-nil if any characters in current buffer need encoding in headers. The buffer may be narrowed." - (require 'message) ; for message-posting-charset (let ((charsets (mm-find-mime-charset-region (point-min) (point-max)))) (goto-char (point-min)) @@ -334,7 +333,7 @@ The buffer may be narrowed." (re-search-forward rfc2047-encoded-word-regexp nil t) (goto-char (point-min)))) (and charsets - (not (equal charsets (list (car message-posting-charset)))))))) + (not (equal charsets (list (car (bound-and-true-p message-posting-charset))))))))) ;; Use this syntax table when parsing into regions that may need ;; encoding. Double quotes are string delimiters, backslash is -- 2.39.2