Commit 1c33719f authored by Dave Love's avatar Dave Love
Browse files

(base64): Require unconditionally.

(message-posting-charset): Defvar when compiling.
(rfc2047-encode-message-header, rfc2047-encodable-p): Require
message.
parent 08c9a385
...@@ -24,16 +24,15 @@ ...@@ -24,16 +24,15 @@
;;; Code: ;;; Code:
(eval-and-compile (require 'base64)
(eval
'(unless (fboundp 'base64-decode-string)
(require 'base64))))
(require 'qp) (require 'qp)
(require 'mm-util) (require 'mm-util)
(require 'ietf-drums) (require 'ietf-drums)
(require 'mail-prsvr) (require 'mail-prsvr)
(eval-when-compile (defvar message-posting-charset))
(defvar rfc2047-header-encoding-alist (defvar rfc2047-header-encoding-alist
'(("Newsgroups" . nil) '(("Newsgroups" . nil)
("Message-ID" . nil) ("Message-ID" . nil)
...@@ -108,6 +107,7 @@ Valid encodings are nil, `Q' and `B'.") ...@@ -108,6 +107,7 @@ Valid encodings are nil, `Q' and `B'.")
"Encode the message header according to `rfc2047-header-encoding-alist'. "Encode the message header according to `rfc2047-header-encoding-alist'.
Should be called narrowed to the head of the message." Should be called narrowed to the head of the message."
(interactive "*") (interactive "*")
(require 'message)
(save-excursion (save-excursion
(goto-char (point-min)) (goto-char (point-min))
(let (alist elem method) (let (alist elem method)
...@@ -151,6 +151,7 @@ Should be called narrowed to the head of the message." ...@@ -151,6 +151,7 @@ Should be called narrowed to the head of the message."
(defun rfc2047-encodable-p (&optional header) (defun rfc2047-encodable-p (&optional header)
"Say whether the current (narrowed) buffer contains characters that need encoding in headers." "Say whether the current (narrowed) buffer contains characters that need encoding in headers."
(require 'message)
(let ((charsets (let ((charsets
(mapcar (mapcar
'mm-mime-charset 'mm-mime-charset
......
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