Commit 964b0e76 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

merge emacs-23

parents f16d9837 b8d747b9
2011-05-23 Kenichi Handa <>
* mail/sendmail.el: Require `rfc2047'.
(mail-insert-from-field): Do not perform RFC2047 encoding.
(mail-encode-header): New function.
(sendmail-send-it): Set buffer-file-coding-system of the work
buffer to the return value of select-message-coding-system. Call
* mail/smtpmail.el (smtpmail-send-it): Call mail-encode-header.
2011-05-22 Sean Neakums <> (tiny change)
* mail/supercite.el (sc-default-cite-frame): Handle
......@@ -34,7 +34,7 @@
(require 'rmail)
(require 'mailalias))
(autoload 'rfc2047-encode-string "rfc2047")
(require 'rfc2047)
(defgroup sendmail nil
"Mail sending commands for Emacs."
......@@ -952,12 +952,14 @@ of outgoing mails regardless of the current language environment.
See also the function `select-message-coding-system'.")
(defun mail-insert-from-field ()
"Insert the \"From:\" field of a mail header.
The style of the field is determined by the variable `mail-from-style'.
This function does not perform RFC2047 encoding."
(let* ((login user-mail-address)
(fullname (user-full-name))
(quote-fullname nil))
(if (string-match "[^\0-\177]" fullname)
(setq fullname (rfc2047-encode-string fullname)
quote-fullname t))
(setq quote-fullname t))
(cond ((null mail-from-style)
(insert "From: " login "\n"))
;; This is deprecated.
......@@ -1017,6 +1019,20 @@ See also the function `select-message-coding-system'.")
(goto-char fullname-start))))
(insert ")\n")))))
(defun mail-encode-header (beg end)
"Encode the mail header between BEG and END according to RFC2047.
Return non-nil if and only if some part of the header is encoded."
(narrow-to-region beg end)
(let* ((selected (select-message-coding-system))
(if (and selected (coding-system-get selected :mime-charset))
(cons selected mm-coding-system-priorities)
(tick (buffer-chars-modified-tick)))
(= tick (buffer-chars-modified-tick)))))
;; Normally you will not need to modify these options unless you are
;; using some non-genuine substitute for sendmail which does not
;; implement each and every option that the original supports.
......@@ -1060,6 +1076,7 @@ external program defined by `sendmail-program'."
(unless multibyte
(set-buffer-multibyte nil))
(insert-buffer-substring mailbuf)
(set-buffer-file-coding-system selected-coding)
(goto-char (point-max))
;; require one newline at the end.
(or (= (preceding-char) ?\n)
......@@ -1166,6 +1183,8 @@ external program defined by `sendmail-program'."
(if mail-interactive
(with-current-buffer errbuf
;; Encode the header according to RFC2047.
(mail-encode-header (point-min) delimline)
(goto-char (point-min))
(if (let ((case-fold-search t))
(or resend-to-addresses
......@@ -362,6 +362,8 @@ The list is in preference order.")
(if mail-interactive
(with-current-buffer errbuf
;; Encode the header according to RFC2047.
(mail-encode-header (point-min) delimline)
(setq smtpmail-address-buffer (generate-new-buffer "*smtp-mail*"))
(setq smtpmail-recipient-address-list
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