Mercurial > emacs
comparison lisp/gnus/message.el @ 111401:733acab855e4
Merge changes made in Gnus trunk.
mm-decode.el (mm-save-part): Put the entire path in the `M-n' slot.
nnimap.el (nnimap-find-article-by-message-id): Don't EXAMINE a group if it's already selected.
gnus.texi (Customizing the IMAP Connection): Document `nnimap-expunge' and remove `nnimap-expunge-inbox' from example.
gnus.texi (Customizing the IMAP Connection): Remove nnir mention, since that works by default.
gnus-sum.el (gnus-summary-show-article): Take `t' as the arg to mean "raw".
gnus-html.el (gnus-html-browse-url): Implement mailto: URLs.
shr.el (shr-browse-url): Implement mailto: URLs.
nnir.el, gnus-sum.el: Improve thread-referral.
message.el (message-send-mail): Use the value of message-courtesy-message from the message buffer.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Thu, 04 Nov 2010 22:18:09 +0000 |
parents | 43d891f84e91 |
children | b75e6634a171 |
comparison
equal
deleted
inserted
replaced
111400:17d49dad0c8b | 111401:733acab855e4 |
---|---|
4496 content-type)))) | 4496 content-type)))) |
4497 (not | 4497 (not |
4498 (string= "base64" | 4498 (string= "base64" |
4499 (message-fetch-field | 4499 (message-fetch-field |
4500 "content-transfer-encoding"))))))) | 4500 "content-transfer-encoding"))))))) |
4501 (message-insert-courtesy-copy)) | 4501 (message-insert-courtesy-copy |
4502 (with-current-buffer mailbuf | |
4503 message-courtesy-message))) | |
4502 ;; Let's make sure we encoded all the body. | 4504 ;; Let's make sure we encoded all the body. |
4503 (assert (save-excursion | 4505 (assert (save-excursion |
4504 (goto-char (point-min)) | 4506 (goto-char (point-min)) |
4505 (not (re-search-forward "[^\000-\377]" nil t)))) | 4507 (not (re-search-forward "[^\000-\377]" nil t)))) |
4506 (mm-disable-multibyte) | 4508 (mm-disable-multibyte) |
5937 (string-match "@.+\\.." secure-sender)) | 5939 (string-match "@.+\\.." secure-sender)) |
5938 (insert "Sender: " secure-sender "\n")))) | 5940 (insert "Sender: " secure-sender "\n")))) |
5939 ;; Check for IDNA | 5941 ;; Check for IDNA |
5940 (message-idna-to-ascii-rhs)))) | 5942 (message-idna-to-ascii-rhs)))) |
5941 | 5943 |
5942 (defun message-insert-courtesy-copy () | 5944 (defun message-insert-courtesy-copy (message) |
5943 "Insert a courtesy message in mail copies of combined messages." | 5945 "Insert a courtesy message in mail copies of combined messages." |
5944 (let (newsgroups) | 5946 (let (newsgroups) |
5945 (save-excursion | 5947 (save-excursion |
5946 (save-restriction | 5948 (save-restriction |
5947 (message-narrow-to-headers) | 5949 (message-narrow-to-headers) |
5948 (when (setq newsgroups (message-fetch-field "newsgroups")) | 5950 (when (setq newsgroups (message-fetch-field "newsgroups")) |
5949 (goto-char (point-max)) | 5951 (goto-char (point-max)) |
5950 (insert "Posted-To: " newsgroups "\n"))) | 5952 (insert "Posted-To: " newsgroups "\n"))) |
5951 (forward-line 1) | 5953 (forward-line 1) |
5952 (when message-courtesy-message | 5954 (when message |
5953 (cond | 5955 (cond |
5954 ((string-match "%s" message-courtesy-message) | 5956 ((string-match "%s" message) |
5955 (insert (format message-courtesy-message newsgroups))) | 5957 (insert (format message newsgroups))) |
5956 (t | 5958 (t |
5957 (insert message-courtesy-message))))))) | 5959 (insert message))))))) |
5958 | 5960 |
5959 ;;; | 5961 ;;; |
5960 ;;; Setting up a message buffer | 5962 ;;; Setting up a message buffer |
5961 ;;; | 5963 ;;; |
5962 | 5964 |