Synch to No Gnus 200411252343.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 65b37a1..0e7e060 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2004-11-25  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+       * mml.el (mml-preview): Widen the message buffer before copying
+       the contents to the preview buffer; sort headers before previewing.
+
        * message.el (message-hidden-headers): Fix the way to avoid a bug
        in the `repeat' widget in Emacs 21.3 or earlier.
 

diff --git a/lisp/mml.el b/lisp/mml.el
index c01a922..7e9d54d 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -1098,9 +1098,11 @@ If RAW, don't highlight the article."
       (message-options-set-recipient)
       (when (boundp 'gnus-buffers)
        (push mml-preview-buffer gnus-buffers))
-      (set-buffer mml-preview-buffer)
-      (erase-buffer)
-      (insert-buffer-substring buf)
+      (save-restriction
+       (widen)
+       (set-buffer mml-preview-buffer)
+       (erase-buffer)
+       (insert-buffer-substring buf))
       (mml-preview-insert-mail-followup-to)
       (let ((message-deletable-headers (if (message-news-p)
                                           nil
@@ -1113,6 +1115,7 @@ If RAW, don't highlight the article."
           (concat "^" (regexp-quote mail-header-separator) "\n") nil t)
          (replace-match "\n"))
       (let ((mail-header-separator ""));; mail-header-separator is removed.
+       (message-sort-headers)
        (mml-to-mime))
       (if raw
          (when (fboundp 'set-buffer-multibyte)