Mercurial > emacs

comparison lisp/gnus/mml.el @ 111092:c8d6ec9d7037

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mml.el (mml-preview): Work properly when editing article.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Fri, 22 Oct 2010 04:15:14 +0000
parents c6a7ac5bcef4
children d80a6f7f8b4a
comparison
equal deleted inserted replaced
111091:a5d92e87313c 111092:c8d6ec9d7037
1464 (concat (if raw "*Raw MIME preview of " 1464 (concat (if raw "*Raw MIME preview of "
1465 "*MIME preview of ") (buffer-name)))) 1465 "*MIME preview of ") (buffer-name))))
1466 (require 'gnus-msg) ; for gnus-setup-posting-charset 1466 (require 'gnus-msg) ; for gnus-setup-posting-charset
1467 (save-excursion 1467 (save-excursion
1468 (let* ((buf (current-buffer)) 1468 (let* ((buf (current-buffer))
1469 (article-editing (eq major-mode 'gnus-article-edit-mode))
1469 (message-options message-options) 1470 (message-options message-options)
1470 (message-this-is-mail (message-mail-p)) 1471 (message-this-is-mail (message-mail-p))
1471 (message-this-is-news (message-news-p)) 1472 (message-this-is-news (message-news-p))
1472 (message-posting-charset (or (gnus-setup-posting-charset 1473 (message-posting-charset (or (gnus-setup-posting-charset
1473 (save-restriction 1474 (save-restriction
1483 (erase-buffer) 1484 (erase-buffer)
1484 (insert-buffer-substring buf)) 1485 (insert-buffer-substring buf))
1485 (mml-preview-insert-mail-followup-to) 1486 (mml-preview-insert-mail-followup-to)
1486 (let ((message-deletable-headers (if (message-news-p) 1487 (let ((message-deletable-headers (if (message-news-p)
1487 nil 1488 nil
1488 message-deletable-headers))) 1489 message-deletable-headers))
1490 (mail-header-separator (if article-editing
1491 ""
1492 mail-header-separator)))
1489 (message-generate-headers 1493 (message-generate-headers
1490 (copy-sequence (if (message-news-p) 1494 (copy-sequence (if (message-news-p)
1491 message-required-news-headers 1495 message-required-news-headers
1492 message-required-mail-headers)))) 1496 message-required-mail-headers)))
1493 (if (re-search-forward 1497 (if (and (not article-editing)
1494 (concat "^" (regexp-quote mail-header-separator) "\n") nil t) 1498 (re-search-forward
1495 (replace-match "\n")) 1499 (concat "^" (regexp-quote mail-header-separator) "\n")
1496 (let ((mail-header-separator ""));; mail-header-separator is removed. 1500 nil t))
1501 (replace-match "\n"))
1502 (setq mail-header-separator "")
1497 (message-sort-headers) 1503 (message-sort-headers)
1498 (mml-to-mime)) 1504 (mml-to-mime))
1499 (if raw 1505 (if raw
1500 (when (fboundp 'set-buffer-multibyte) 1506 (when (fboundp 'set-buffer-multibyte)
1501 (let ((s (buffer-string))) 1507 (let ((s (buffer-string)))