[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r102045: mml.el (mml-preview): Work p
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r102045: mml.el (mml-preview): Work properly when editing article. |
Date: |
Fri, 22 Oct 2010 04:15:14 +0000 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 102045
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Fri 2010-10-22 04:15:14 +0000
message:
mml.el (mml-preview): Work properly when editing article.
modified:
lisp/gnus/ChangeLog
lisp/gnus/mml.el
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2010-10-22 01:39:13 +0000
+++ b/lisp/gnus/ChangeLog 2010-10-22 04:15:14 +0000
@@ -1,5 +1,7 @@
2010-10-22 Katsumi Yamaoka <address@hidden>
+ * mml.el (mml-preview): Work properly when editing article.
+
* gnus-start.el (gnus-read-active-file-1): Don't add method to
gnus-have-read-active-file if it's already been in.
=== modified file 'lisp/gnus/mml.el'
--- a/lisp/gnus/mml.el 2010-10-16 01:55:08 +0000
+++ b/lisp/gnus/mml.el 2010-10-22 04:15:14 +0000
@@ -1466,6 +1466,7 @@
(require 'gnus-msg) ; for gnus-setup-posting-charset
(save-excursion
(let* ((buf (current-buffer))
+ (article-editing (eq major-mode 'gnus-article-edit-mode))
(message-options message-options)
(message-this-is-mail (message-mail-p))
(message-this-is-news (message-news-p))
@@ -1485,15 +1486,20 @@
(mml-preview-insert-mail-followup-to)
(let ((message-deletable-headers (if (message-news-p)
nil
- message-deletable-headers)))
+ message-deletable-headers))
+ (mail-header-separator (if article-editing
+ ""
+ mail-header-separator)))
(message-generate-headers
(copy-sequence (if (message-news-p)
message-required-news-headers
- message-required-mail-headers))))
- (if (re-search-forward
- (concat "^" (regexp-quote mail-header-separator) "\n") nil t)
- (replace-match "\n"))
- (let ((mail-header-separator ""));; mail-header-separator is removed.
+ message-required-mail-headers)))
+ (if (and (not article-editing)
+ (re-search-forward
+ (concat "^" (regexp-quote mail-header-separator) "\n")
+ nil t))
+ (replace-match "\n"))
+ (setq mail-header-separator "")
(message-sort-headers)
(mml-to-mime))
(if raw
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r102045: mml.el (mml-preview): Work properly when editing article.,
Katsumi Yamaoka <=