auto upstream

3 files changed, 13 insertions, 5 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 565096b6289..052c0324734 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-art.el (gnus-article-browse-html-parts): Use <div align="left">
+        instead of <pre> to align message header.
+
 2012-12-12  Sam Steingold  <sds@gnu.org>
 
         * gnus.el (gnus-other-frame-resume-function): Add user option.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 9dfe119f831..43c8ca78601 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -2884,14 +2884,16 @@ message header will be added to the bodies of the \"text/html\" parts."
                    (insert header "\n")
                    (setq title (message-fetch-field "subject"))
                    (goto-char (point-min))
-                   (while (re-search-forward "\\(<\\)\\|\\(>\\)\\|&" nil t)
+                   (while (re-search-forward "\\(<\\)\\|\\(>\\)\\|\\(&\\)\\|\n"
+                                             nil t)
                      (replace-match (cond ((match-beginning 1) "&lt;")
                                           ((match-beginning 2) "&gt;")
-                                          (t "&amp;"))))
+                                          ((match-beginning 3) "&amp;")
+                                          (t "<br>\n"))))
                    (goto-char (point-min))
-                   (insert "<pre>\n")
+                   (insert "<div align=\"left\">\n")
                    (goto-char (point-max))
-                   (insert "</pre>\n<hr>\n")
+                   (insert "</div>\n<hr>\n")
                    ;; We have to examine charset one by one since
                    ;; charset specified in parts might be different.
                    (if (eq charset 'gnus-decoded)
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 753c5fb473e..3849604088d 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -2504,6 +2504,7 @@ Disabling the agent may result in noticeable loss of performance."
 
 (defcustom gnus-other-frame-resume-function 'gnus-group-get-new-news
   "Function called by the command `gnus-other-frame' when resuming Gnus."
+  :version "24.4"
   :group 'gnus-start
   :type '(choice (function-item gnus)
                  (function-item gnus-no-server)
@@ -4404,7 +4405,7 @@ current display is used."
                (make-frame gnus-other-frame-parameters))))
       (if alive
           (progn (switch-to-buffer gnus-group-buffer)
-           (funcall gnus-other-frame-resume-function arg))
+                 (funcall gnus-other-frame-resume-function arg))
         (funcall gnus-other-frame-function arg)
         (add-hook 'gnus-exit-gnus-hook 'gnus-delete-gnus-frame)
   ;; One might argue that `gnus-delete-gnus-frame' should not be called