X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus-art.el;h=efb336f6197b461f66fecae80eef9b3e192ee740;hb=874e8b557e911b10c15acc68ed83001be480a89b;hp=8d92c4f201dda12e3a553d0e447e85e27c3dcf77;hpb=f0c2d45d7a3aa9463cc66ffdec5e95a5cf555549;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 8d92c4f..efb336f 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -1,5 +1,5 @@
 ;;; gnus-art.el --- article mode commands for Semi-gnus
-;; Copyright (C) 1996,97,98 Free Software Foundation, Inc.
+;; Copyright (C) 1996,97,98,99 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	MORIOKA Tomohiko <morioka@jaist.ac.jp>
@@ -55,6 +55,11 @@
   :link '(custom-manual "(gnus)The Article Buffer")
   :group 'gnus)
 
+(defgroup gnus-article-treat nil
+  "Treating article parts."
+  :link '(custom-manual "(gnus)Article Hiding")
+  :group 'gnus-article)
+
 (defgroup gnus-article-hiding nil
   "Hiding article parts."
   :link '(custom-manual "(gnus)Article Hiding")
@@ -125,7 +130,7 @@
     "^X-Pgp-Public-Key-Url:" "^X-Auth:" "^X-From-Line:"
     "^X-Gnus-Article-Number:" "^X-Majordomo:" "^X-Url:" "^X-Sender:"
     "^X-Mailing-List:" "^MBOX-Line" "^Priority:" "^X-Pgp" "^X400-[-A-Za-z]+:"
-    "^Status:")
+    "^Status:" "^X-Gnus-Mail-Source:" "^Cancel-Lock:")
   "*All headers that start with this regexp will be hidden.
 This variable can also be a list of regexps of headers to be ignored.
 If `gnus-visible-headers' is non-nil, this variable will be ignored."
@@ -135,7 +140,7 @@ If `gnus-visible-headers' is non-nil, this variable will be ignored."
   :group 'gnus-article-hiding)
 
 (defcustom gnus-visible-headers
-  "From:\\|^Newsgroups:\\|^Subject:\\|^Date:\\|^\\(Mail-\\)?Followup-To:\\|^\\(Mail-\\)?Reply-To:\\|^Mail-Copies-To:\\|^Organization:\\|^Summary:\\|^Keywords:\\|^To:\\|^Cc:\\|^Posted-To:\\|^Apparently-To:\\|^Gnus-Warning:\\|^Resent-From:\\|X-Sent:"
+  "^From:\\|^Newsgroups:\\|^Subject:\\|^Date:\\|^Followup-To:\\|^Reply-To:\\|^Organization:\\|^Summary:\\|^Keywords:\\|^To:\\|^[BGF]?Cc:\\|^Posted-To:\\|^Mail-Copies-To:\\|^Apparently-To:\\|^Gnus-Warning:\\|^Resent-From:\\|^X-Sent:"
   "*All headers that do not match this regexp will be hidden.
 This variable can also be a list of regexp of headers to remain visible.
 If this variable is non-nil, `gnus-ignored-headers' will be ignored."
@@ -412,7 +417,12 @@ beginning of a line."
 
 (defcustom gnus-article-mode-line-format "Gnus: %g %S%m"
   "*The format specification for the article mode line.
-See `gnus-summary-mode-line-format' for a closer description."
+See `gnus-summary-mode-line-format' for a closer description.
+
+The following additional specs are available:
+
+%w  The article washing status.
+%m  The number of MIME parts in the article."
   :type 'string
   :group 'gnus-article-various)
 
@@ -427,8 +437,7 @@ See `gnus-summary-mode-line-format' for a closer description."
   :group 'gnus-article-various)
 
 (defcustom gnus-article-prepare-hook nil
-  "*A hook called after an article has been prepared in the article buffer.
-If you want to run a special decoding program like nkf, use this hook."
+  "*A hook called after an article has been prepared in the article buffer."
   :type 'hook
   :group 'gnus-article-various)
 
@@ -577,7 +586,6 @@ displayed by the first non-nil matching CONTENT face."
     ("\205" "...")
     ("\213" "<")
     ("\214" "OE")
-    ("\205" "...")
     ("\221" "`")
     ("\222" "'")
     ("\223" "``")
@@ -601,26 +609,338 @@ displayed by the first non-nil matching CONTENT face."
   :group 'gnus-article-mime
   :type '(repeat regexp))
 
-(defcustom gnus-treat-body-highlight-signature t
-  "Highlight the signature."
-  :group 'gnus-article
-  :type '(choice (const :tag "Off" nil)
-		 (const :tag "On" t)
-		 (const :tag "Last" last)
-		 (integer :tag "Less")
-		 (sexp :tag "Predicate")))
-
 (defcustom gnus-article-mime-part-function nil
-  "Function called with a MIME handle as the argument."
+  "Function called with a MIME handle as the argument.
+This is meant for people who want to do something automatic based
+on parts -- for instance, adding Vcard info to a database."
   :group 'gnus-article-mime
   :type 'function)
 
+(defcustom gnus-mime-multipart-functions nil
+  "An alist of MIME types to functions to display them.")
+
+(defcustom gnus-article-date-lapsed-new-header nil
+  "Whether the X-Sent and Date headers can coexist.
+When using `gnus-treat-date-lapsed', the \"X-Sent:\" header will
+either replace the old \"Date:\" header (if this variable is nil), or
+be added below it (otherwise)."
+  :group 'gnus-article-headers
+  :type 'boolean)
+
+;;;
+;;; The treatment variables
+;;;
+
+(defvar gnus-part-display-hook nil
+  "Hook called on parts that are to receive treatment.")
+
+(defvar gnus-article-treat-custom
+  '(choice (const :tag "Off" nil)
+	   (const :tag "On" t)
+	   (const :tag "Header" head)
+	   (const :tag "Last" last)
+	   (integer :tag "Less")
+	   (sexp :tag "Predicate")))
+
+(defvar gnus-article-treat-head-custom
+  '(choice (const :tag "Off" nil)
+	   (const :tag "Header" head)))
+
+(defvar gnus-article-treat-types '("text/plain")
+  "Parts to treat.")
+
+(defvar gnus-inhibit-treatment nil
+  "Whether to inhibit treatment.")
+
+(defcustom gnus-treat-highlight-signature '(or last (typep "text/x-vcard"))
+  "Highlight the signature.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-custom)
+(put 'gnus-treat-highlight-signature 'highlight t)
+
+(defcustom gnus-treat-buttonize t
+  "Add buttons.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-custom)
+(put 'gnus-treat-buttonize 'highlight t)
+
+(defcustom gnus-treat-buttonize-head 'head
+  "Add buttons to the head.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-head-custom)
+(put 'gnus-treat-buttonize-head 'highlight t)
+
+(defcustom gnus-treat-emphasize t
+  "Emphasize text.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-custom)
+(put 'gnus-treat-emphasize 'highlight t)
+
+(defcustom gnus-treat-strip-cr nil
+  "Remove carriage returns.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-custom)
+
+(defcustom gnus-treat-hide-headers 'head
+  "Hide headers.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-head-custom)
+
+(defcustom gnus-treat-hide-boring-headers nil
+  "Hide boring headers.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-head-custom)
+
+(defcustom gnus-treat-hide-signature nil
+  "Hide the signature.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-custom)
+
+(defcustom gnus-treat-fill-article nil
+  "Fill the article.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-custom)
+
+(defcustom gnus-treat-hide-citation nil
+  "Hide cited text.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-custom)
+
+(defcustom gnus-treat-strip-pgp t
+  "Strip PGP signatures.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-custom)
+
+(defcustom gnus-treat-strip-pem nil
+  "Strip PEM signatures.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-custom)
+
+(defcustom gnus-treat-strip-banner t
+  "Strip banners from articles.
+The banner to be stripped is specified in the `banner' group parameter.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-custom)
+
+(defcustom gnus-treat-highlight-headers 'head
+  "Highlight the headers.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-head-custom)
+(put 'gnus-treat-highlight-headers 'highlight t)
+
+(defcustom gnus-treat-highlight-citation t
+  "Highlight cited text.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-custom)
+(put 'gnus-treat-highlight-citation 'highlight t)
+
+(defcustom gnus-treat-date-ut nil
+  "Display the Date in UT (GMT).
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-head-custom)
+
+(defcustom gnus-treat-date-local nil
+  "Display the Date in the local timezone.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-head-custom)
+
+(defcustom gnus-treat-date-lapsed nil
+  "Display the Date header in a way that says how much time has elapsed.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-head-custom)
+
+(defcustom gnus-treat-date-original nil
+  "Display the date in the original timezone.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-head-custom)
+
+(defcustom gnus-treat-date-iso8601 nil
+  "Display the date in the ISO8601 format.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-head-custom)
+
+(defcustom gnus-treat-date-user-defined nil
+  "Display the date in a user-defined format.
+The format is defined by the `gnus-article-time-format' variable.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-head-custom)
+
+(defcustom gnus-treat-strip-headers-in-body t
+  "Strip the X-No-Archive header line from the beginning of the body.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-custom)
+
+(defcustom gnus-treat-strip-trailing-blank-lines nil
+  "Strip trailing blank lines.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-custom)
+
+(defcustom gnus-treat-strip-leading-blank-lines nil
+  "Strip leading blank lines.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-custom)
+
+(defcustom gnus-treat-strip-multiple-blank-lines nil
+  "Strip multiple blank lines.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-custom)
+
+(defcustom gnus-treat-strip-blank-lines nil
+  "Strip all blank lines.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-custom)
+
+(defcustom gnus-treat-overstrike t
+  "Treat overstrike highlighting.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-custom)
+(put 'gnus-treat-overstrike 'highlight t)
+
+(defcustom gnus-treat-display-xface (if (and gnus-xemacs (featurep 'xface))
+					'head nil)
+  "Display X-Face headers.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-head-custom)
+(put 'gnus-treat-display-xface 'highlight t)
+
+(defcustom gnus-treat-display-smileys (if (and gnus-xemacs
+					       (featurep 'xpm))
+					  t nil)
+  "Display smileys.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-custom)
+(put 'gnus-treat-display-smileys 'highlight t)
+
+(defcustom gnus-treat-display-picons (if gnus-xemacs 'head nil)
+  "Display picons.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-head-custom)
+(put 'gnus-treat-display-picons 'highlight t)
+
+(defcustom gnus-treat-capitalize-sentences nil
+  "Capitalize sentence-starting words.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-custom)
+
+(defcustom gnus-treat-fill-long-lines nil
+  "Fill long lines.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-custom)
+
+(defcustom gnus-treat-play-sounds nil
+  "Play sounds.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See the manual for details."
+  :group 'gnus-article-treat
+  :type gnus-article-treat-custom)
+
 ;;; Internal variables
 
+(defvar article-goto-body-goes-to-point-min-p nil)
+(defvar gnus-article-wash-types nil)
+
 (defvar gnus-article-mime-handle-alist-1 nil)
 (defvar gnus-treatment-function-alist
-  '((gnus-treat-body-highlight-signature gnus-article-highlight-signature nil)
-    ))
+  '((gnus-treat-strip-banner gnus-article-strip-banner)
+    (gnus-treat-strip-headers-in-body gnus-article-strip-headers-in-body)
+    (gnus-treat-highlight-signature gnus-article-highlight-signature)
+    (gnus-treat-buttonize gnus-article-add-buttons)
+    (gnus-treat-fill-article gnus-article-fill-cited-article)
+    (gnus-treat-fill-long-lines gnus-article-fill-long-lines)
+    (gnus-treat-strip-cr gnus-article-remove-cr)
+    (gnus-treat-emphasize gnus-article-emphasize)
+    (gnus-treat-hide-headers gnus-article-maybe-hide-headers)
+    (gnus-treat-hide-boring-headers gnus-article-hide-boring-headers)
+    (gnus-treat-hide-signature gnus-article-hide-signature)
+    (gnus-treat-hide-citation gnus-article-hide-citation)
+    (gnus-treat-strip-pgp gnus-article-hide-pgp)
+    (gnus-treat-strip-pem gnus-article-hide-pem)
+    (gnus-treat-highlight-headers gnus-article-highlight-headers)
+    (gnus-treat-highlight-citation gnus-article-highlight-citation)
+    (gnus-treat-highlight-signature gnus-article-highlight-signature)
+    (gnus-treat-date-ut gnus-article-date-ut)
+    (gnus-treat-date-local gnus-article-date-local)
+    (gnus-treat-date-lapsed gnus-article-date-lapsed)
+    (gnus-treat-date-original gnus-article-date-original)
+    (gnus-treat-date-user-defined gnus-article-date-user)
+    (gnus-treat-date-iso8601 gnus-article-date-iso8601)
+    (gnus-treat-strip-trailing-blank-lines
+     gnus-article-remove-trailing-blank-lines)
+    (gnus-treat-strip-leading-blank-lines
+     gnus-article-strip-leading-blank-lines)
+    (gnus-treat-strip-multiple-blank-lines
+     gnus-article-strip-multiple-blank-lines)
+    (gnus-treat-strip-blank-lines gnus-article-strip-blank-lines)
+    (gnus-treat-overstrike gnus-article-treat-overstrike)
+    (gnus-treat-buttonize-head gnus-article-add-buttons-to-head)
+    (gnus-treat-display-xface gnus-article-display-x-face)
+    (gnus-treat-display-smileys gnus-smiley-display)
+    (gnus-treat-display-picons gnus-article-display-picons)
+    (gnus-treat-play-sounds gnus-earcon-display)))
 
 (defvar gnus-article-mime-handle-alist nil)
 (defvar article-lapsed-timer nil)
@@ -653,7 +973,6 @@ Initialized from `text-mode-syntax-table.")
     (put-text-property
      (max (1- b) (point-min))
      b 'intangible (cddr (memq 'intangible props)))))
-
 (defsubst gnus-article-unhide-text (b e)
   "Remove hidden text properties from region between B and E."
   (remove-text-properties b e gnus-hidden-properties)
@@ -663,11 +982,14 @@ Initialized from `text-mode-syntax-table.")
 
 (defun gnus-article-hide-text-type (b e type)
   "Hide text of TYPE between B and E."
+  (push type gnus-article-wash-types)
   (gnus-article-hide-text
    b e (cons 'article-type (cons type gnus-hidden-properties))))
 
 (defun gnus-article-unhide-text-type (b e type)
   "Unhide text of TYPE between B and E."
+  (setq gnus-article-wash-types
+	(delq type gnus-article-wash-types))
   (remove-text-properties
    b e (cons 'article-type (cons type gnus-hidden-properties)))
   (when (memq 'intangible gnus-hidden-properties)
@@ -716,79 +1038,59 @@ Initialized from `text-mode-syntax-table.")
     i))
 
 (defun article-hide-headers (&optional arg delete)
-  "Toggle whether to hide unwanted headers and possibly sort them as well.
-If given a negative prefix, always show; if given a positive prefix,
-always hide."
-  (interactive (gnus-article-hidden-arg))
-  (current-buffer)
-  (if (gnus-article-check-hidden-text 'headers arg)
-      ;; Show boring headers as well.
-      (gnus-article-show-hidden-text 'boring-headers)
-    ;; This function might be inhibited.
-    (unless gnus-inhibit-hiding
-      (save-excursion
-	(save-restriction
-	  (let ((buffer-read-only nil)
-		(case-fold-search t)
-		(props (nconc (list 'article-type 'headers)
-			      gnus-hidden-properties))
-		(max (1+ (length gnus-sorted-header-list)))
-		(ignored (when (not gnus-visible-headers)
-			   (cond ((stringp gnus-ignored-headers)
-				  gnus-ignored-headers)
-				 ((listp gnus-ignored-headers)
-				  (mapconcat 'identity gnus-ignored-headers
-					     "\\|")))))
-		(visible
-		 (cond ((stringp gnus-visible-headers)
-			gnus-visible-headers)
-		       ((and gnus-visible-headers
-			     (listp gnus-visible-headers))
-			(mapconcat 'identity gnus-visible-headers "\\|"))))
-		(inhibit-point-motion-hooks t)
-		beg)
-	    ;; First we narrow to just the headers.
-	    (widen)
-	    (goto-char (point-min))
-	    ;; Hide any "From " lines at the beginning of (mail) articles.
-	    (while (looking-at "From ")
-	      (forward-line 1))
-	    (unless (bobp)
-	      (if delete
-		  (delete-region (point-min) (point))
-		(gnus-article-hide-text (point-min) (point) props)))
-	    ;; Then treat the rest of the header lines.
-	    (narrow-to-region
-	     (point)
-	     (if (search-forward "\n\n" nil t) ; if there's a body
-		 (progn (forward-line -1) (point))
-	       (point-max)))
-	    ;; Then we use the two regular expressions
-	    ;; `gnus-ignored-headers' and `gnus-visible-headers' to
-	    ;; select which header lines is to remain visible in the
-	    ;; article buffer.
-	    (goto-char (point-min))
-	    (while (re-search-forward "^[^ \t]*:" nil t)
-	      (beginning-of-line)
-	      ;; Mark the rank of the header.
-	      (put-text-property
-	       (point) (1+ (point)) 'message-rank
-	       (if (or (and visible (looking-at visible))
-		       (and ignored
-			    (not (looking-at ignored))))
-		   (gnus-article-header-rank)
-		 (+ 2 max)))
-	      (forward-line 1))
-	    (message-sort-headers-1)
-	    (when (setq beg (text-property-any
-			     (point-min) (point-max) 'message-rank (+ 2 max)))
-	      ;; We make the unwanted headers invisible.
-	      (if delete
-		  (delete-region beg (point-max))
-		;; Suggested by Sudish Joseph <joseph@cis.ohio-state.edu>.
-		(gnus-article-hide-text-type beg (point-max) 'headers))
-	      ;; Work around XEmacs lossage.
-	      (put-text-property (point-min) beg 'invisible nil))))))))
+  "Hide unwanted headers and possibly sort them as well."
+  (interactive)
+  ;; This function might be inhibited.
+  (unless gnus-inhibit-hiding
+    (save-excursion
+      (save-restriction
+	(let ((buffer-read-only nil)
+	      (case-fold-search t)
+	      (max (1+ (length gnus-sorted-header-list)))
+	      (ignored (when (not gnus-visible-headers)
+			 (cond ((stringp gnus-ignored-headers)
+				gnus-ignored-headers)
+			       ((listp gnus-ignored-headers)
+				(mapconcat 'identity gnus-ignored-headers
+					   "\\|")))))
+	      (visible
+	       (cond ((stringp gnus-visible-headers)
+		      gnus-visible-headers)
+		     ((and gnus-visible-headers
+			   (listp gnus-visible-headers))
+		      (mapconcat 'identity gnus-visible-headers "\\|"))))
+	      (inhibit-point-motion-hooks t)
+	      beg)
+	  ;; First we narrow to just the headers.
+	  (article-narrow-to-head)
+	  ;; Hide any "From " lines at the beginning of (mail) articles.
+	  (while (looking-at "From ")
+	    (forward-line 1))
+	  (unless (bobp)
+	    (delete-region (point-min) (point)))
+	  ;; Then treat the rest of the header lines.
+	  ;; Then we use the two regular expressions
+	  ;; `gnus-ignored-headers' and `gnus-visible-headers' to
+	  ;; select which header lines is to remain visible in the
+	  ;; article buffer.
+	  (while (re-search-forward "^[^ \t]*:" nil t)
+	    (beginning-of-line)
+	    ;; Mark the rank of the header.
+	    (put-text-property
+	     (point) (1+ (point)) 'message-rank
+	     (if (or (and visible (looking-at visible))
+		     (and ignored
+			  (not (looking-at ignored))))
+		 (gnus-article-header-rank)
+	       (+ 2 max)))
+	    (forward-line 1))
+	  (message-sort-headers-1)
+	  (when (setq beg (text-property-any
+			   (point-min) (point-max) 'message-rank (+ 2 max)))
+	    ;; We delete the unwanted headers.
+	    (add-text-properties (point-min) (+ 5 (point-min))
+				 '(article-type headers dummy-invisible t))
+	    (delete-region beg (point-max))))))))
 
 (defun article-hide-boring-headers (&optional arg)
   "Toggle hiding of headers that aren't very interesting.
@@ -803,14 +1105,14 @@ always hide."
 	      (list gnus-boring-article-headers)
 	      (inhibit-point-motion-hooks t)
 	      elem)
-	  (nnheader-narrow-to-headers)
+	  (article-narrow-to-head)
 	  (while list
 	    (setq elem (pop list))
 	    (goto-char (point-min))
 	    (cond
 	     ;; Hide empty headers.
 	     ((eq elem 'empty)
-	      (while (re-search-forward "^[^:]+:[ \t]*\n[^ \t]" nil t)
+	      (while (re-search-forward "^[^: \t]+:[ \t]*\n[^ \t]" nil t)
 		(forward-line -1)
 		(gnus-article-hide-text-type
 		 (progn (beginning-of-line) (point))
@@ -880,8 +1182,41 @@ always hide."
 	   (point-max)))
        'boring-headers))))
 
+(defvar gnus-article-normalized-header-length 40
+  "Length of normalized headers.")
+
+(defun article-normalize-headers ()
+  "Make all header lines 40 characters long."
+  (interactive)
+  (let ((buffer-read-only nil)
+	column)
+    (save-excursion
+      (save-restriction
+	(article-narrow-to-head)
+	(while (not (eobp))
+	  (cond
+	   ((< (setq column (- (gnus-point-at-eol) (point)))
+	       gnus-article-normalized-header-length)
+	    (end-of-line)
+	    (insert (make-string
+		     (- gnus-article-normalized-header-length column)
+		     ? )))
+	   ((> column gnus-article-normalized-header-length)
+	    (gnus-put-text-property
+	     (progn
+	       (forward-char gnus-article-normalized-header-length)
+	       (point))
+	     (gnus-point-at-eol)
+	     'invisible t))
+	   (t
+	    ;; Do nothing.
+	    ))
+	  (forward-line 1))))))
+
 (defun article-treat-dumbquotes ()
-  "Translate M******** sm*rtq**t*s into proper text."
+  "Translate M******** sm*rtq**t*s into proper text.
+Note that this function guesses whether a character is a sm*rtq**t* or
+not, so it should only be used interactively."
   (interactive)
   (article-translate-strings gnus-article-dumbquotes-map))
 
@@ -940,30 +1275,42 @@ MAP is an alist where the elements are on the form (\"from\" \"to\")."
 	      (put-text-property
 	       (point) (1+ (point)) 'face 'underline)))))))))
 
-(defun article-fill ()
-  "Format too long lines."
+(defun article-fill-long-lines ()
+  "Fill lines that are wider than the window width."
   (interactive)
   (save-excursion
-    (let ((buffer-read-only nil))
-      (widen)
+    (let ((buffer-read-only nil)
+	  (width (window-width (get-buffer-window (current-buffer)))))
+      (save-restriction
+	(article-goto-body)
+	(let ((adaptive-fill-mode nil))
+	  (while (not (eobp))
+	    (end-of-line)
+	    (when (>= (current-column) (min fill-column width))
+	      (narrow-to-region (point) (gnus-point-at-bol))
+	      (fill-paragraph nil)
+	      (goto-char (point-max))
+	      (widen))
+	    (forward-line 1)))))))
+
+(defun article-capitalize-sentences ()
+  "Capitalize the first word in each sentence."
+  (interactive)
+  (save-excursion
+    (let ((buffer-read-only nil)
+	  (paragraph-start "^[\n\^L]"))
       (article-goto-body)
-      (end-of-line 1)
-      (let ((paragraph-start "^[>|#:<;* ]*[ \t]*$")
-	    (adaptive-fill-regexp "[ \t]*\\([|#:<;>*]+ *\\)?")
-	    (adaptive-fill-mode t))
-	(while (not (eobp))
-	  (and (>= (current-column) (min fill-column (window-width)))
-	       (/= (preceding-char) ?:)
-	       (fill-paragraph nil))
-	  (end-of-line 2))))))
+      (while (not (eobp))
+	(capitalize-word 1)
+	(forward-sentence)))))
 
 (defun article-remove-cr ()
-  "Translate CRLF pairs into LF, and then CR into LF.."
+  "Remove trailing CRs and then translate remaining CRs into LFs."
   (interactive)
   (save-excursion
     (let ((buffer-read-only nil))
       (goto-char (point-min))
-      (while (search-forward "\r$" nil t)
+      (while (re-search-forward "\r+$" nil t)
 	(replace-match "" t t))
       (goto-char (point-min))
       (while (search-forward "\r" nil t)
@@ -997,7 +1344,8 @@ MAP is an alist where the elements are on the form (\"from\" \"to\")."
 	  (case-fold-search t)
 	  from last)
       (save-restriction
-	(nnheader-narrow-to-headers)
+	(article-narrow-to-head)
+	(goto-char (point-min))
 	(setq from (message-fetch-field "from"))
 	(goto-char (point-min))
 	(while (and gnus-article-x-face-command
@@ -1043,8 +1391,7 @@ MAP is an alist where the elements are on the form (\"from\" \"to\")."
     (set-buffer gnus-article-buffer)
     (let ((inhibit-point-motion-hooks t)
 	  buffer-read-only
-	  (rfc2047-default-charset gnus-newsgroup-default-charset)
-	  (mm-charset-iso-8859-1-forced gnus-newsgroup-iso-8859-1-forced))
+	  (mail-parse-charset gnus-newsgroup-charset))
       (mail-decode-encoded-word-region (point-min) (point-max)))))
 
 (defun article-decode-charset (&optional prompt)
@@ -1053,22 +1400,22 @@ If PROMPT (the prefix), prompt for a coding system to use."
   (interactive "P")
   (save-excursion
     (save-restriction
-      (message-narrow-to-head)
+      (article-narrow-to-head)
       (let* ((inhibit-point-motion-hooks t)
 	     (case-fold-search t)
 	     (ct (message-fetch-field "Content-Type" t))
 	     (cte (message-fetch-field "Content-Transfer-Encoding" t))
-	     (ctl (and ct (condition-case ()
-			      (mail-header-parse-content-type ct)
-			    (error nil))))
+	     (ctl (and ct (ignore-errors
+			    (mail-header-parse-content-type ct))))
 	     (charset (cond
 		       (prompt
 			(mm-read-coding-system "Charset to decode: "))
 		       (ctl
 			(mail-content-type-get ctl 'charset))))
-	     (rfc2047-default-charset gnus-newsgroup-default-charset)
-	     (mm-charset-iso-8859-1-forced gnus-newsgroup-iso-8859-1-forced)
+	     (mail-parse-charset gnus-newsgroup-charset)
 	     buffer-read-only)
+	(when (memq charset gnus-newsgroup-ignored-charsets)
+	  (setq charset nil))
 	(goto-char (point-max))
 	(widen)
 	(forward-line 1)
@@ -1098,9 +1445,7 @@ or not."
   (save-excursion
     (let ((buffer-read-only nil)
 	  (type (gnus-fetch-field "content-transfer-encoding"))
-	  (charset
-	   (or gnus-newsgroup-default-charset mm-default-coding-system))
-	  (mm-charset-iso-8859-1-forced gnus-newsgroup-iso-8859-1-forced))
+	  (charset gnus-newsgroup-charset))
       (when (or force
 		(and type (string-match "quoted-printable" (downcase type))))
 	(article-goto-body)
@@ -1110,20 +1455,18 @@ or not."
 	  (when charset
 	    (mm-decode-body charset)))))))
 
-(defun article-hide-pgp (&optional arg)
-  "Toggle hiding of any PGP headers and signatures in the current article.
-If given a negative prefix, always show; if given a positive prefix,
-always hide."
-  (interactive (gnus-article-hidden-arg))
-  (unless (gnus-article-check-hidden-text 'pgp arg)
-    (save-excursion
+(defun article-hide-pgp ()
+  "Remove any PGP headers and signatures in the current article."
+  (interactive)
+  (save-excursion
+    (save-restriction
       (let ((inhibit-point-motion-hooks t)
 	    buffer-read-only beg end)
-	(widen)
-	(goto-char (point-min))
+	(article-goto-body)
 	;; Hide the "header".
-	(when (search-forward "\n-----BEGIN PGP SIGNED MESSAGE-----\n" nil t)
-	  (delete-region (1+ (match-beginning 0)) (match-end 0))
+	(when (re-search-forward "^-----BEGIN PGP SIGNED MESSAGE-----\n" nil t)
+	  (push 'pgp gnus-article-wash-types)
+	  (delete-region (match-beginning 0) (match-end 0))
 	  ;; PGP 5 and GNU PG add a `Hash: <>' comment, hide that too
 	  (when (looking-at "Hash:.*$")
 	    (delete-region (point) (1+ (gnus-point-at-eol))))
@@ -1156,25 +1499,45 @@ always hide."
   (unless (gnus-article-check-hidden-text 'pem arg)
     (save-excursion
       (let (buffer-read-only end)
-	(widen)
 	(goto-char (point-min))
-	;; hide the horrendously ugly "header".
-	(and (search-forward "\n-----BEGIN PRIVACY-ENHANCED MESSAGE-----\n"
-			     nil
-			     t)
-	     (setq end (1+ (match-beginning 0)))
-	     (gnus-article-hide-text-type
-	      end
-	      (if (search-forward "\n\n" nil t)
-		  (match-end 0)
-		(point-max))
-	      'pem))
-	;; hide the trailer as well
-	(and (search-forward "\n-----END PRIVACY-ENHANCED MESSAGE-----\n"
-			     nil
-			     t)
-	     (gnus-article-hide-text-type
-	      (match-beginning 0) (match-end 0) 'pem))))))
+	;; Hide the horrendously ugly "header".
+	(when (and (search-forward
+		    "\n-----BEGIN PRIVACY-ENHANCED MESSAGE-----\n"
+		    nil t)
+		   (setq end (1+ (match-beginning 0))))
+	  (push 'pem gnus-article-wash-types)
+	  (gnus-article-hide-text-type
+	   end
+	   (if (search-forward "\n\n" nil t)
+	       (match-end 0)
+	     (point-max))
+	   'pem)
+	  ;; Hide the trailer as well
+	  (when (search-forward "\n-----END PRIVACY-ENHANCED MESSAGE-----\n"
+				nil t)
+	    (gnus-article-hide-text-type
+	     (match-beginning 0) (match-end 0) 'pem)))))))
+
+(defun article-strip-banner ()
+  "Strip the banner specified by the `banner' group parameter."
+  (interactive)
+  (save-excursion
+    (save-restriction
+      (let ((inhibit-point-motion-hooks t)
+	    (banner (gnus-group-get-parameter gnus-newsgroup-name 'banner))
+	    (gnus-signature-limit nil)
+	    buffer-read-only beg end)
+	(when banner
+	  (article-goto-body)
+	  (cond
+	   ((eq banner 'signature)
+	    (when (gnus-article-narrow-to-signature)
+	      (widen)
+	      (forward-line -1)
+	      (delete-region (point) (point-max))))
+	   ((stringp banner)
+	    (while (re-search-forward banner nil t)
+	      (delete-region (match-beginning 0) (match-end 0))))))))))
 
 (defun article-hide-signature (&optional arg)
   "Hide the signature in the current article.
@@ -1189,6 +1552,15 @@ always hide."
 	    (gnus-article-hide-text-type
 	     (point-min) (point-max) 'signature)))))))
 
+(defun article-strip-headers-in-body ()
+  "Strip offensive headers from bodies."
+  (interactive)
+  (save-excursion
+    (article-goto-body)
+    (let ((case-fold-search t))
+      (when (looking-at "x-no-archive:")
+	(gnus-delete-line)))))
+
 (defun article-strip-leading-blank-lines ()
   "Remove all blank lines from the beginning of the article."
   (interactive)
@@ -1200,13 +1572,29 @@ always hide."
 		    (looking-at "[ \t]*$"))
 	  (gnus-delete-line))))))
 
+(defun article-narrow-to-head ()
+  "Narrow the buffer to the head of the message.
+Point is left at the beginning of the narrowed-to region."
+  (narrow-to-region
+   (goto-char (point-min))
+   (if (search-forward "\n\n" nil 1)
+       (1- (point))
+     (point-max)))
+  (goto-char (point-min)))
+
 (defun article-goto-body ()
-  "Place point at the start of the body."  
+  "Place point at the start of the body."
   (goto-char (point-min))
-  (if (search-forward "\n\n" nil t)
-      t
+  (cond
+   ;; This variable is only bound when dealing with separate
+   ;; MIME body parts.
+   (article-goto-body-goes-to-point-min-p
+    t)
+   ((search-forward "\n\n" nil t)
+    t)
+   (t
     (goto-char (point-max))
-    nil))
+    nil)))
 
 (defun article-strip-multiple-blank-lines ()
   "Replace consecutive blank lines with one empty line."
@@ -1237,6 +1625,16 @@ always hide."
       (while (re-search-forward "^[ \t]+" nil t)
 	(replace-match "" t t)))))
 
+(defun article-strip-trailing-space ()
+  "Remove all white space from the end of the lines in the article."
+  (interactive)
+  (save-excursion
+    (let ((inhibit-point-motion-hooks t)
+	  buffer-read-only)
+      (article-goto-body)
+      (while (re-search-forward "[ \t]+$" nil t)
+	(replace-match "" t t)))))
+
 (defun article-strip-blank-lines ()
   "Strip leading, trailing and multiple blank lines."
   (interactive)
@@ -1256,7 +1654,6 @@ always hide."
 
 (defun gnus-article-narrow-to-signature ()
   "Narrow to the signature; return t if a signature is found, else nil."
-  (widen)
   (let ((inhibit-point-motion-hooks t))
     (when (gnus-article-search-signature)
       (forward-line 1)
@@ -1297,38 +1694,6 @@ Put point at the beginning of the signature separator."
       (goto-char cur)
       nil)))
 
-(eval-and-compile
-  (autoload 'w3-display "w3-parse")
-  (autoload 'w3-do-setup "w3" "" t)
-  (autoload 'w3-region "w3-display" "" t))
-
-(defun gnus-article-treat-html ()
-  "Render HTML."
-  (interactive)
-  (let ((cbuf (current-buffer)))
-    (set-buffer gnus-article-buffer)
-    (let (buf buffer-read-only b e)
-      (w3-do-setup)
-      (goto-char (point-min))
-      (narrow-to-region
-       (if (search-forward "\n\n" nil t)
-	   (setq b (point))
-	 (point-max))
-       (setq e (point-max)))
-      (with-temp-buffer
-	(insert-buffer-substring gnus-article-buffer b e)
-	(require 'url)
-	(save-window-excursion
-	  (w3-region (point-min) (point-max))
-	  (setq buf (buffer-substring-no-properties (point-min) (point-max)))))
-      (when buf
-	(delete-region (point-min) (point-max))
-	(insert buf))
-      (widen)
-      (goto-char (point-min))
-      (set-window-start (get-buffer-window (current-buffer)) (point-min))
-      (set-buffer cbuf))))
-
 (defun gnus-article-hidden-arg ()
   "Return the current prefix arg as a number, or 0 if no prefix."
   (list (if current-prefix-arg
@@ -1341,7 +1706,6 @@ Arg can be nil or a number.  Nil and positive means hide, negative
 means show, 0 means toggle."
   (save-excursion
     (save-restriction
-      (widen)
       (let ((hide (gnus-article-hidden-text-p type)))
 	(cond
 	 ((or (null arg)
@@ -1358,7 +1722,8 @@ means show, 0 means toggle."
   "Say whether the current buffer contains hidden text of type TYPE."
   (let ((pos (text-property-any (point-min) (point-max) 'article-type type)))
     (while (and pos
-		(not (get-text-property pos 'invisible)))
+		(not (get-text-property pos 'invisible))
+		(not (get-text-property pos 'dummy-invisible)))
       (setq pos
 	    (text-property-any (1+ pos) (point-max) 'article-type type)))
     (if pos
@@ -1396,44 +1761,60 @@ If HIDE, hide the text instead."
 (defun article-date-ut (&optional type highlight header)
   "Convert DATE date to universal time in the current article.
 If TYPE is `local', convert to local time; if it is `lapsed', output
-how much time has lapsed since DATE."
+how much time has lapsed since DATE. For `lapsed', the value of
+`gnus-article-date-lapsed-new-header' says whether the \"X-Sent:\" header
+should replace the \"Date:\" one, or should be added below it."
   (interactive (list 'ut t))
   (let* ((header (or header
-		     (mail-header-date gnus-current-headers)
+		     (mail-header-date (save-excursion
+					 (set-buffer gnus-summary-buffer)
+					 gnus-current-headers))
 		     (message-fetch-field "date")
 		     ""))
+	 (tdate-regexp "^Date:[ \t]\\|^X-Sent:[ \t]")
+ 	 (date-regexp
+	  (cond
+	   ((not gnus-article-date-lapsed-new-header)
+	    tdate-regexp)
+	   ((eq type 'lapsed)
+	    "^X-Sent:[ \t]")
+	   (t
+	    "^Date:[ \t]")))
 	 (date (if (vectorp header) (mail-header-date header)
 		 header))
-	 (date-regexp "^Date:[ \t]\\|^X-Sent:[ \t]")
 	 (inhibit-point-motion-hooks t)
-	 bface eface newline)
+	 (newline t)
+	 bface eface)
     (when (and date (not (string= date "")))
       (save-excursion
 	(save-restriction
-	  (nnheader-narrow-to-headers)
+	  (article-narrow-to-head)
+	  (when (re-search-forward tdate-regexp nil t)
+	    (setq bface (get-text-property (gnus-point-at-bol) 'face)
+		  eface (get-text-property (1- (gnus-point-at-eol))
+					   'face))
+	    (forward-line 1))
+	  (goto-char (point-min))
 	  (let ((buffer-read-only nil))
-	    ;; Delete any old Date headers.
-	    (if (re-search-forward date-regexp nil t)
-		(progn
-		  (setq bface (get-text-property (gnus-point-at-bol) 'face)
-			eface (get-text-property (1- (gnus-point-at-eol))
-						 'face))
+ 	    ;; Delete any old Date headers.
+ 	    (while (re-search-forward date-regexp nil t)
+	      (if newline
 		  (delete-region (progn (beginning-of-line) (point))
 				 (progn (end-of-line) (point)))
-		  (beginning-of-line))
-	      (goto-char (point-max))
-	      (setq newline t))
+		(delete-region (progn (beginning-of-line) (point))
+			       (progn (forward-line 1) (point))))
+	      (setq newline nil))
 	    (insert (article-make-date-line date type))
+	    (when newline
+	      (insert "\n")
+	      (forward-line -1))
 	    ;; Do highlighting.
 	    (beginning-of-line)
 	    (when (looking-at "\\([^:]+\\): *\\(.*\\)$")
 	      (put-text-property (match-beginning 1) (1+ (match-end 1))
 				 'face bface)
 	      (put-text-property (match-beginning 2) (match-end 2)
-				 'face eface))
-	    (when newline
-	      (end-of-line)
-	      (insert "\n"))))))))
+				 'face eface))))))))
 
 (defun article-make-date-line (date type)
   "Return a DATE line of TYPE."
@@ -1477,7 +1858,7 @@ how much time has lapsed since DATE."
      ((eq type 'iso8601)
       (concat
        "Date: "
-       (format-time-string "%Y%M%DT%h%m%s" time)))
+       (format-time-string "%Y%m%dT%H%M%S" time)))
      ;; Do an X-Sent lapsed format.
      ((eq type 'lapsed)
       ;; If the date is seriously mangled, the timezone functions are
@@ -1552,7 +1933,8 @@ function and want to see what the date was before converting."
 	   (when (eq major-mode 'gnus-article-mode)
 	     (goto-char (point-min))
 	     (when (re-search-forward "^X-Sent:" nil t)
-	       (article-date-lapsed t)))))))))
+	       (article-date-lapsed t))))
+	 nil 'visible)))))
 
 (defun gnus-start-date-timer (&optional n)
   "Start a timer to update the X-Sent header in the article buffers.
@@ -1929,26 +2311,35 @@ If variable `gnus-use-long-file-name' is non-nil, it is
    '(article-hide-headers
      article-hide-boring-headers
      article-treat-overstrike
-     (article-fill . gnus-article-word-wrap)
+     article-fill-long-lines
+     article-capitalize-sentences
      article-remove-cr
      article-display-x-face
+     article-de-quoted-unreadable
      article-hide-pgp
+     article-strip-banner
      article-hide-pem
      article-hide-signature
+     article-strip-headers-in-body
      article-remove-trailing-blank-lines
      article-strip-leading-blank-lines
      article-strip-multiple-blank-lines
      article-strip-leading-space
+     article-strip-trailing-space
      article-strip-blank-lines
      article-strip-all-blank-lines
      article-date-local
      article-date-iso8601
      article-date-original
      article-date-ut
+     article-decode-mime-words
+     article-decode-charset
+     article-decode-encoded-words
      article-date-user
      article-date-lapsed
      article-emphasize
      article-treat-dumbquotes
+     article-normalize-headers
      (article-show-all . gnus-article-show-all-headers))))
 
 ;;;
@@ -1961,6 +2352,7 @@ If variable `gnus-use-long-file-name' is non-nil, it is
   " " gnus-article-goto-next-page
   "\177" gnus-article-goto-prev-page
   [delete] gnus-article-goto-prev-page
+  [backspace] gnus-article-goto-prev-page
   "\C-c^" gnus-article-refer-article
   "h" gnus-article-show-summary
   "s" gnus-article-show-summary
@@ -1982,8 +2374,28 @@ If variable `gnus-use-long-file-name' is non-nil, it is
   "\M-^" gnus-article-read-summary-keys
   "\M-g" gnus-article-read-summary-keys)
 
-(substitute-key-definition
- 'undefined 'gnus-article-read-summary-keys gnus-article-mode-map)
+;; Define almost undefined keys to `gnus-article-read-summary-keys'.
+(mapcar
+ (lambda (key)
+   (unless (lookup-key gnus-article-mode-map key)
+     (define-key gnus-article-mode-map key
+       'gnus-article-read-summary-keys)))
+ (delq nil
+       (append
+	(mapcar
+	 (lambda (elt)
+	   (let ((key (car elt)))
+	     (and (> (length key) 0)
+		  (not (eq 'menu-bar (aref key 0)))
+		  (symbolp (lookup-key gnus-summary-mode-map key))
+		  key)))
+	 (accessible-keymaps gnus-summary-mode-map))
+	(let ((c 127)
+	      keys)
+	  (while (>= c 32)
+	    (push (char-to-string c) keys)
+	    (decf c))
+	  keys))))
 
 (defun gnus-article-make-menu-bar ()
   (gnus-turn-off-edit-menu 'article)
@@ -2045,6 +2457,10 @@ commands:
   (make-local-variable 'gnus-page-broken)
   (make-local-variable 'gnus-button-marker-list)
   (make-local-variable 'gnus-article-current-summary)
+  (make-local-variable 'gnus-article-mime-handles)
+  (make-local-variable 'gnus-article-decoded-p)
+  (make-local-variable 'gnus-article-mime-handle-alist)
+  (make-local-variable 'gnus-article-washed-types)
   (gnus-set-default-directory)
   (buffer-disable-undo)
   (setq buffer-read-only t)
@@ -2061,6 +2477,7 @@ commands:
 			 (substring name (match-end 0))))))
     (setq gnus-article-buffer name)
     (setq gnus-original-article-buffer original)
+    (setq gnus-article-mime-handle-alist nil)
     ;; This might be a variable local to the summary buffer.
     (unless gnus-single-article-buffer
       (save-excursion
@@ -2109,14 +2526,19 @@ commands:
 (defun gnus-article-display-mime-message ()
   "Article display method for MIME message."
   ;; called from `gnus-original-article-buffer'.
-  (let ((charset (with-current-buffer gnus-summary-buffer
-		   default-mime-charset)))
+  (let (charset all-headers)
+    (with-current-buffer gnus-summary-buffer
+      (setq charset default-mime-charset
+	    all-headers gnus-have-all-headers))
     (make-local-variable 'default-mime-charset)
     (setq default-mime-charset charset)
+    (with-current-buffer (get-buffer-create gnus-article-buffer)
+      (make-local-variable 'default-mime-charset)
+      (setq default-mime-charset charset))
     (mime-display-message mime-message-structure
 			  gnus-article-buffer nil gnus-article-mode-map)
-    (make-local-variable 'default-mime-charset)
-    (setq default-mime-charset charset)
+    (when all-headers
+      (gnus-article-hide-headers nil -1))
     )
   ;; `mime-display-message' changes current buffer to `gnus-article-buffer'.
   (make-local-variable 'mime-button-mother-dispatcher)
@@ -2251,8 +2673,6 @@ If ALL-HEADERS is non-nil, no headers are hidden."
 		(when (gnus-visual-p 'article-highlight 'highlight)
 		  (gnus-run-hooks 'gnus-visual-mark-article-hook))
 		;; Set the global newsgroup variables here.
-		;; Suggested by Jim Sisolak
-		;; <sisolak@trans4.neep.wisc.edu>.
 		(gnus-set-global-variables)
 		(setq gnus-have-all-headers
 		      (or all-headers gnus-show-all-headers))))
@@ -2268,11 +2688,12 @@ If ALL-HEADERS is non-nil, no headers are hidden."
 	    (let ((gnus-article-mime-handle-alist-1
 		   gnus-article-mime-handle-alist))
 	      (gnus-set-mode-line 'article))
-	    (gnus-configure-windows 'article)
 	    (article-goto-body)
 	    (set-window-point (get-buffer-window (current-buffer)) (point))
+	    (gnus-configure-windows 'article)
 	    t))))))
 
+;;;###autoload
 (defun gnus-article-prepare-display ()
   "Make the current buffer look like a nice article."
   (let ((method
@@ -2286,7 +2707,7 @@ If ALL-HEADERS is non-nil, no headers are hidden."
     ;; Display message.
     (funcall method)
     ;; Associate this article with the current summary buffer.
-    (setq gnus-article-current-summary (current-buffer))
+    (setq gnus-article-current-summary gnus-summary-buffer)
     ;; Perform the article display hooks.
     (gnus-run-hooks 'gnus-article-display-hook)))
 
@@ -2294,17 +2715,19 @@ If ALL-HEADERS is non-nil, no headers are hidden."
 ;;; Gnus MIME viewing functions
 ;;;
 
-(defvar gnus-mime-button-line-format "%{%([%p. %t%d%n]%)%}%e\n"
+(defvar gnus-mime-button-line-format "%{%([%p. %d%T]%)%}%e\n"
   "The following specs can be used:
 %t  The MIME type
+%T  MIME type, along with additional info
 %n  The `name' parameter
 %d  The description, if any
 %l  The length of the encoded part
-%p  The part identifier
+%p  The part identifier number
 %e  Dots if the part isn't displayed")
 
 (defvar gnus-mime-button-line-format-alist
   '((?t gnus-tmp-type ?s)
+    (?T gnus-tmp-type-long ?s)
     (?n gnus-tmp-name ?s)
     (?d gnus-tmp-description ?s)
     (?p gnus-tmp-id ?s)
@@ -2313,11 +2736,11 @@ If ALL-HEADERS is non-nil, no headers are hidden."
 
 (defvar gnus-mime-button-commands
   '((gnus-article-press-button	"\r"	"Toggle Display")
-    ;(gnus-mime-view-part	"\M-\r"	"View Interactively...")
     (gnus-mime-view-part	"v"	"View Interactively...")
     (gnus-mime-save-part	"o"	"Save...")
-    (gnus-mime-copy-part	"c"	"View In Buffer")
-    (gnus-mime-inline-part	"i"	"View Inline")
+    (gnus-mime-copy-part	"c"	"View As Text, In Other Buffer")
+    (gnus-mime-inline-part	"i"	"View As Text, In This Buffer")
+    (gnus-mime-internalize-part	"E"	"View Internally")
     (gnus-mime-externalize-part	"e"	"View Externally")
     (gnus-mime-pipe-part	"|"	"Pipe To Command...")))
 
@@ -2331,7 +2754,7 @@ If ALL-HEADERS is non-nil, no headers are hidden."
   (setq gnus-mime-button-map (make-sparse-keymap))
   (set-keymap-parent gnus-mime-button-map gnus-article-mode-map)
   (define-key gnus-mime-button-map gnus-mouse-2 'gnus-article-push-button)
-  (define-key gnus-mime-button-map gnus-mouse-3 'gnus-mime-button-menu)
+  (define-key gnus-mime-button-map gnus-down-mouse-3 'gnus-mime-button-menu)
   (mapcar (lambda (c)
 	    (define-key gnus-mime-button-map (cadr c) (car c)))
 	  gnus-mime-button-commands))
@@ -2339,27 +2762,29 @@ If ALL-HEADERS is non-nil, no headers are hidden."
 (defun gnus-mime-button-menu (event)
   "Construct a context-sensitive menu of MIME commands."
   (interactive "e")
-  (gnus-article-check-buffer)
-  (let ((response (x-popup-menu 
-                  t `("MIME Part" 
-                      ("" ,@(mapcar (lambda (c)
-                                      (cons (caddr c) (car c)))
-                                    gnus-mime-button-commands)))))
-        (pos (event-start event)))
-    (when response
+  (save-excursion
+    (let ((pos (event-start event)))
       (set-buffer (window-buffer (posn-window pos)))
       (goto-char (posn-point pos))
-      (funcall response))))
-
-(defun gnus-mime-view-all-parts ()
+      (gnus-article-check-buffer)
+      (let ((response (x-popup-menu
+		       t `("MIME Part"
+			   ("" ,@(mapcar (lambda (c)
+					   (cons (caddr c) (car c)))
+					 gnus-mime-button-commands))))))
+	(if response
+	    (funcall response))))))
+
+(defun gnus-mime-view-all-parts (&optional handles)
   "View all the MIME parts."
   (interactive)
-  (gnus-article-check-buffer)
-  (let ((handles gnus-article-mime-handles)
-	(rfc2047-default-charset gnus-newsgroup-default-charset)
-	(mm-charset-iso-8859-1-forced gnus-newsgroup-iso-8859-1-forced))
-    (while handles
-      (mm-display-part (pop handles)))))
+  (save-current-buffer
+    (set-buffer gnus-article-buffer)
+    (let ((handles (or handles gnus-article-mime-handles))
+	  (mail-parse-charset gnus-newsgroup-charset))
+      (if (stringp (car handles))
+	  (gnus-mime-view-all-parts (cdr handles))
+	(mapcar 'mm-display-part handles)))))
 
 (defun gnus-mime-save-part ()
   "Save the MIME part under point."
@@ -2379,8 +2804,7 @@ If ALL-HEADERS is non-nil, no headers are hidden."
   "Interactively choose a view method for the MIME part under point."
   (interactive)
   (gnus-article-check-buffer)
-  (let ((data (get-text-property (point) 'gnus-data))
-	(url-standalone-mode (not gnus-plugged)))
+  (let ((data (get-text-property (point) 'gnus-data)))
     (mm-interactively-view-part data)))
 
 (defun gnus-mime-copy-part (&optional handle)
@@ -2388,47 +2812,59 @@ If ALL-HEADERS is non-nil, no headers are hidden."
   (interactive)
   (gnus-article-check-buffer)
   (let* ((handle (or handle (get-text-property (point) 'gnus-data)))
-	 (contents (mm-get-part handle))
-	 (buffer (generate-new-buffer
-		       (file-name-nondirectory
-			(or
-			 (mail-content-type-get (mm-handle-type handle) 'name)
-			 (mail-content-type-get (mm-handle-type handle)
-						'filename)
-			 "*decoded*")))))
+	 (contents (mm-get-part handle))|
+	 (base (file-name-nondirectory
+		(or
+		 (mail-content-type-get (mm-handle-type handle) 'name)
+		 (mail-content-type-get (mm-handle-type handle)
+					'filename)
+		 "*decoded*")))
+	 (buffer (generate-new-buffer base)))
     (switch-to-buffer buffer)
     (insert contents)
-    (normal-mode)
+    ;; We do it this way to make `normal-mode' set the appropriate mode.
+    (unwind-protect
+	(progn
+	  (setq buffer-file-name (expand-file-name base))
+	  (normal-mode))
+      (setq buffer-file-name nil))
     (goto-char (point-min))))
 
-(defun gnus-mime-inline-part (&optional charset)
+(defun gnus-mime-inline-part (&optional handle)
   "Insert the MIME part under point into the current buffer."
-  (interactive "P") ; For compatibility reasons we are not using "z".
+  (interactive)
   (gnus-article-check-buffer)
-  (let* ((data (get-text-property (point) 'gnus-data))
-	 (contents (mm-get-part data))
-	 (url-standalone-mode (not gnus-plugged))
+  (let* ((handle (or handle (get-text-property (point) 'gnus-data)))
+	 contents
 	 (b (point))
 	 buffer-read-only)
-    (if (mm-handle-undisplayer data)
-	(mm-remove-part data)
+    (if (mm-handle-undisplayer handle)
+	(mm-remove-part handle)
+      (setq contents (mm-get-part handle))
       (forward-line 2)
-      (when charset 
-	(unless (symbolp charset)
-	  (setq charset (mm-read-coding-system "Charset: ")))
-	(setq contents (mm-decode-coding-string contents charset)))
-      (mm-insert-inline data contents)
+      (mm-insert-inline handle contents)
       (goto-char b))))
 
 (defun gnus-mime-externalize-part (&optional handle)
-  "Insert the MIME part under point into the current buffer."
+  "View the MIME part under point with an external viewer."
   (interactive)
   (gnus-article-check-buffer)
   (let* ((handle (or handle (get-text-property (point) 'gnus-data)))
-	 (url-standalone-mode (not gnus-plugged))
 	 (mm-user-display-methods nil)
-	 (rfc2047-default-charset gnus-newsgroup-default-charset)
-	 (mm-charset-iso-8859-1-forced gnus-newsgroup-iso-8859-1-forced))
+	 (mm-all-images-fit t)
+	 (mail-parse-charset gnus-newsgroup-charset))
+    (if (mm-handle-undisplayer handle)
+	(mm-remove-part handle)
+      (mm-display-part handle))))
+
+(defun gnus-mime-internalize-part (&optional handle)
+  "View the MIME part under point with an internal viewer."
+  (interactive)
+  (gnus-article-check-buffer)
+  (let* ((handle (or handle (get-text-property (point) 'gnus-data)))
+	 (mm-user-display-methods '((".*" . inline)))
+	 (mm-all-images-fit t)
+	 (mail-parse-charset gnus-newsgroup-charset))
     (if (mm-handle-undisplayer handle)
 	(mm-remove-part handle)
       (mm-display-part handle))))
@@ -2445,27 +2881,32 @@ If ALL-HEADERS is non-nil, no headers are hidden."
   "Pipe MIME part N, which is the numerical prefix."
   (interactive "p")
   (gnus-article-part-wrapper n 'mm-pipe-part))
-  
+
 (defun gnus-article-save-part (n)
   "Save MIME part N, which is the numerical prefix."
   (interactive "p")
   (gnus-article-part-wrapper n 'mm-save-part))
-  
+
 (defun gnus-article-interactively-view-part (n)
-  "Pipe MIME part N, which is the numerical prefix."
+  "View MIME part N interactively, which is the numerical prefix."
   (interactive "p")
   (gnus-article-part-wrapper n 'mm-interactively-view-part))
-  
+
 (defun gnus-article-copy-part (n)
-  "Pipe MIME part N, which is the numerical prefix."
+  "Copy MIME part N, which is the numerical prefix."
   (interactive "p")
   (gnus-article-part-wrapper n 'gnus-mime-copy-part))
 
 (defun gnus-article-externalize-part (n)
-  "Pipe MIME part N, which is the numerical prefix."
+  "View MIME part N externally, which is the numerical prefix."
   (interactive "p")
   (gnus-article-part-wrapper n 'gnus-mime-externalize-part))
-  
+
+(defun gnus-article-inline-part (n)
+  "Inline MIME part N, which is the numerical prefix."
+  (interactive "p")
+  (gnus-article-part-wrapper n 'gnus-mime-inline-part))
+
 (defun gnus-article-view-part (n)
   "View MIME part N, which is the numerical prefix."
   (interactive "p")
@@ -2485,22 +2926,38 @@ If ALL-HEADERS is non-nil, no headers are hidden."
   (let ((id (get-text-property (point) 'gnus-part))
 	(point (point))
 	buffer-read-only)
-    (delete-region (gnus-point-at-bol) (progn (forward-line 1) (point)))
-    (gnus-insert-mime-button
-     handle id (list (not (mm-handle-displayed-p handle))))
+    (forward-line 1)
     (prog1
 	(let ((window (selected-window))
-	      (rfc2047-default-charset gnus-newsgroup-default-charset)
-	      (mm-charset-iso-8859-1-forced gnus-newsgroup-iso-8859-1-forced))
+	      (mail-parse-charset gnus-newsgroup-charset))
 	  (save-excursion
 	    (unwind-protect
-		(let ((win (get-buffer-window (current-buffer) t)))
-		  (if win
-		      (select-window win))
+		(let ((win (get-buffer-window (current-buffer) t))
+		      (beg (point)))
+		  (when win
+		    (select-window win))
 		  (goto-char point)
 		  (forward-line)
-		  (mm-display-part handle))
+		  (if (mm-handle-displayed-p handle)
+		      ;; This will remove the part.
+		      (mm-display-part handle)
+		    (save-restriction
+		      (narrow-to-region (point) (1+ (point)))
+		      (mm-display-part handle)
+		      ;; We narrow to the part itself and
+		      ;; then call the treatment functions.
+		      (goto-char (point-min))
+		      (forward-line 1)
+		      (narrow-to-region (point) (point-max))
+		      (gnus-treat-article
+		       nil id
+		       (1- (length gnus-article-mime-handles))
+		       (car (mm-handle-type handle))))))
 	      (select-window window))))
+      (goto-char point)
+      (delete-region (gnus-point-at-bol) (progn (forward-line 1) (point)))
+      (gnus-insert-mime-button
+       handle id (list (mm-handle-displayed-p handle)))
       (goto-char point))))
 
 (defun gnus-article-goto-part (n)
@@ -2510,25 +2967,30 @@ If ALL-HEADERS is non-nil, no headers are hidden."
       (goto-char point))))
 
 (defun gnus-insert-mime-button (handle gnus-tmp-id &optional displayed)
-  (let ((gnus-tmp-name (mail-content-type-get (mm-handle-type handle) 'name))
+  (let ((gnus-tmp-name
+	 (or (mail-content-type-get (mm-handle-type handle)
+				    'name)
+	     (mail-content-type-get (mm-handle-disposition handle)
+				    'filename)
+	     ""))
 	(gnus-tmp-type (car (mm-handle-type handle)))
-	(gnus-tmp-description (mm-handle-description handle))
+	(gnus-tmp-description
+	 (mail-decode-encoded-word-string (or (mm-handle-description handle)
+					      "")))
 	(gnus-tmp-dots
 	 (if (if displayed (car displayed)
 	       (mm-handle-displayed-p handle))
 	     "" "..."))
-	(gnus-tmp-length (save-excursion
-			   (set-buffer (mm-handle-buffer handle))
+	(gnus-tmp-length (with-current-buffer (mm-handle-buffer handle)
 			   (buffer-size)))
-	b e)
-    (setq gnus-tmp-name
-	  (if gnus-tmp-name
-	      (concat " (" gnus-tmp-name ")")
-	    ""))
-    (setq gnus-tmp-description
-	  (if gnus-tmp-description
-	      (concat " (" gnus-tmp-description ")")
-	    ""))
+	gnus-tmp-type-long b e)
+    (when (string-match ".*/" gnus-tmp-name)
+      (setq gnus-tmp-name (replace-match "" t t gnus-tmp-name)))
+    (setq gnus-tmp-type-long (concat gnus-tmp-type
+				     (and (not (equal gnus-tmp-name ""))
+					  (concat "; " gnus-tmp-name))))
+    (or (equal gnus-tmp-description "")
+	(setq gnus-tmp-type-long (concat " --- " gnus-tmp-type-long)))
     (unless (bolp)
       (insert "\n"))
     (setq b (point))
@@ -2541,40 +3003,99 @@ If ALL-HEADERS is non-nil, no headers are hidden."
 		 article-type annotation
 		 gnus-data ,handle))
     (setq e (point))
-    (widget-convert-button 'link b e :action 'gnus-widget-press-button
-			   :button-keymap gnus-mime-button-map)))
+    (widget-convert-button 'link b e
+			   :mime-handle handle
+			   :action 'gnus-widget-press-button
+			   :button-keymap gnus-mime-button-map
+			   :help-echo
+			   (lambda (widget)
+			     ;; Needed to properly clear the message
+			     ;; due to a bug in wid-edit
+			     (setq help-echo-owns-message t)
+			     (format
+			      "Click to %s the MIME part; %s for more options"
+			      (if (mm-handle-displayed-p
+				   (widget-get widget :mime-handle))
+				  "hide" "show")
+			      (if gnus-xemacs "button3" "mouse-3"))))))
 
 (defun gnus-widget-press-button (elems el)
   (goto-char (widget-get elems :from))
-  (let ((url-standalone-mode (not gnus-plugged)))
-    (gnus-article-press-button)))
+  (gnus-article-press-button))
+
+(defvar gnus-displaying-mime nil)
 
 (defun gnus-display-mime (&optional ihandles)
-  "Insert MIME buttons in the buffer."
-  (let* ((handles (or ihandles (mm-dissect-buffer) (mm-uu-dissect)))
-	 handle name type b e display)
-    (unless ihandles
-      ;; Top-level call; we clean up.
-      (mm-destroy-parts gnus-article-mime-handles)
-      (setq gnus-article-mime-handles handles
-	    gnus-article-mime-handle-alist nil)
-      ;; We allow users to glean info from the handles.
-      (when gnus-article-mime-part-function
-	(gnus-mime-part-function handles)))
-    (when (and handles
-	       (or (not (stringp (car handles)))
-		   (cdr handles)))
-      (unless ihandles
-	;; Clean up for mime parts.
-	(article-goto-body)
-	(delete-region (point) (point-max)))
-      (if (stringp (car handles))
-	  (if (equal (car handles) "multipart/alternative")
-	      (let ((id (1+ (length gnus-article-mime-handle-alist))))
-		(push (cons id handles) gnus-article-mime-handle-alist)
-		(gnus-mime-display-alternative (cdr handles) nil nil id))
-	    (gnus-mime-display-mixed (cdr handles)))
-	(gnus-mime-display-single handles)))))
+  "Display the MIME parts."
+  (save-excursion
+    (save-selected-window
+      (let ((window (get-buffer-window gnus-article-buffer))
+	    (point (point)))
+	(when window
+	  (select-window window)
+	  ;; We have to do this since selecting the window
+	  ;; may change the point.  So we set the window point.
+	  (set-window-point window point)))
+      (let* ((handles (or ihandles (mm-dissect-buffer) (mm-uu-dissect)))
+	     buffer-read-only handle name type b e display)
+	(when (and (not ihandles)
+		   (not gnus-displaying-mime))
+	  ;; Top-level call; we clean up.
+	  (mm-destroy-parts gnus-article-mime-handles)
+	  (setq gnus-article-mime-handles handles
+		gnus-article-mime-handle-alist nil)
+	  ;; We allow users to glean info from the handles.
+	  (when gnus-article-mime-part-function
+	    (gnus-mime-part-function handles)))
+	(if (and handles
+		 (or (not (stringp (car handles)))
+		     (cdr handles)))
+	    (progn
+	      (when (and (not ihandles)
+			 (not gnus-displaying-mime))
+		;; Clean up for mime parts.
+		(article-goto-body)
+		(delete-region (point) (point-max)))
+	      (let ((gnus-displaying-mime t))
+		(gnus-mime-display-part handles)))
+	  (save-restriction
+	    (article-goto-body)
+	    (narrow-to-region (point) (point-max))
+	    (gnus-treat-article nil 1 1)
+	    (widen)))
+	;; Highlight the headers.
+	(save-excursion
+	  (save-restriction
+	    (article-goto-body)
+	    (narrow-to-region (point-min) (point))
+	    (gnus-treat-article 'head)))))))
+
+(defvar gnus-mime-display-multipart-as-mixed nil)
+
+(defun gnus-mime-display-part (handle)
+  (cond
+   ;; Single part.
+   ((not (stringp (car handle)))
+    (gnus-mime-display-single handle))
+   ;; User-defined multipart
+   ((cdr (assoc (car handle) gnus-mime-multipart-functions))
+    (funcall (cdr (assoc (car handle) gnus-mime-multipart-functions))
+	     handle))
+   ;; multipart/alternative
+   ((and (equal (car handle) "multipart/alternative")
+	 (not gnus-mime-display-multipart-as-mixed))
+    (let ((id (1+ (length gnus-article-mime-handle-alist))))
+      (push (cons id handle) gnus-article-mime-handle-alist)
+      (gnus-mime-display-alternative (cdr handle) nil nil id)))
+   ;; multipart/related
+   ((and (equal (car handle) "multipart/related")
+	 (not gnus-mime-display-multipart-as-mixed))
+    ;;;!!!We should find the start part, but we just default
+    ;;;!!!to the first part.
+    (gnus-mime-display-part (cadr handle)))
+   ;; Other multiparts are handled like multipart/mixed.
+   (t
+    (gnus-mime-display-mixed (cdr handle)))))
 
 (defun gnus-mime-part-function (handles)
   (if (stringp (car handles))
@@ -2582,32 +3103,27 @@ If ALL-HEADERS is non-nil, no headers are hidden."
     (funcall gnus-article-mime-part-function handles)))
 
 (defun gnus-mime-display-mixed (handles)
-  (let (handle)
-    (while (setq handle (pop handles))
-      (if (stringp (car handle))
-	  (if (equal (car handle) "multipart/alternative")
-	      (let ((id (1+ (length gnus-article-mime-handle-alist))))
-		(push (cons id handle) gnus-article-mime-handle-alist)
-		(gnus-mime-display-alternative (cdr handle) nil nil id))
-	    (gnus-mime-display-mixed (cdr handle)))
-	(gnus-mime-display-single handle)))))
+  (mapcar 'gnus-mime-display-part handles))
 
 (defun gnus-mime-display-single (handle)
   (let ((type (car (mm-handle-type handle)))
 	(ignored gnus-ignored-mime-types)
 	(not-attachment t)
+	(move nil)
 	display text)
     (catch 'ignored
       (progn
 	(while ignored
 	  (when (string-match (pop ignored) type)
 	    (throw 'ignored nil)))
-	(if (and (mm-automatic-display-p type)
-		 (mm-inlinable-part-p type)
-		 (setq not-attachment
+	(if (and (setq not-attachment
 		       (or (not (mm-handle-disposition handle))
 			   (equal (car (mm-handle-disposition handle))
-				  "inline"))))
+				  "inline")
+			   (mm-attachment-override-p type)))
+		 (mm-automatic-display-p type)
+		 (or (mm-inlinable-part-p type)
+		     (mm-automatic-external-display-p type)))
 	    (setq display t)
 	  (when (equal (car (split-string type "/"))
 		       "text")
@@ -2618,31 +3134,41 @@ If ALL-HEADERS is non-nil, no headers are hidden."
 		    (not (gnus-unbuttonized-mime-type-p type)))
 	    (gnus-article-insert-newline)
 	    (gnus-insert-mime-button
-	     handle id (list (or display
-				 (and (not not-attachment) text))))
-	    (gnus-article-insert-newline)))	
-	(gnus-article-insert-newline)
-	(cond
-	 (display
-	  (forward-line -2)
-	  (let ((rfc2047-default-charset gnus-newsgroup-default-charset)
-		(mm-charset-iso-8859-1-forced 
-		 gnus-newsgroup-iso-8859-1-forced))
-	    (mm-display-part handle t))
-	  (goto-char (point-max)))
-	 ((and text not-attachment)
-	  (forward-line -2)
-	  (gnus-article-insert-newline)
-	  (mm-insert-inline handle (mm-get-part handle))
-	  (goto-char (point-max))))))))
+	     handle id (list (or display (and not-attachment text))))
+	    (gnus-article-insert-newline)
+	    (gnus-article-insert-newline)
+	    (setq move t)))
+	(let ((beg (point)))
+	  (cond
+	   (display
+	    (when move
+	      (forward-line -2))
+	    (let ((mail-parse-charset gnus-newsgroup-charset))
+	      (mm-display-part handle t))
+	    (goto-char (point-max)))
+	   ((and text not-attachment)
+	    (when move
+	      (forward-line -2))
+	    (gnus-article-insert-newline)
+	    (mm-insert-inline handle (mm-get-part handle))
+	    (goto-char (point-max))))
+	  ;; Do highlighting.
+	  (save-excursion
+	    (save-restriction
+	      (narrow-to-region beg (point))
+	      (gnus-treat-article
+	       nil (length gnus-article-mime-handle-alist)
+	       (1- (length gnus-article-mime-handles))
+	       (car (mm-handle-type handle))))))))))
 
 (defun gnus-unbuttonized-mime-type-p (type)
   "Say whether TYPE is to be unbuttonized."
-  (catch 'found
-    (let ((types gnus-unbuttonized-mime-types))
-      (while types
-	(when (string-match (pop types) type)
-	  (throw 'found t))))))
+  (unless gnus-inhibit-mime-unbuttonizing
+    (catch 'found
+      (let ((types gnus-unbuttonized-mime-types))
+	(while types
+	  (when (string-match (pop types) type)
+	    (throw 'found t)))))))
 
 (defun gnus-article-insert-newline ()
   "Insert a newline, but mark it as undeletable."
@@ -2698,7 +3224,7 @@ If ALL-HEADERS is non-nil, no headers are hidden."
 	    (gnus-add-text-properties
 	     (setq from (point))
 	     (progn
-	       (insert (format "[%c] %-18s"
+	       (insert (format "(%c) %-18s"
 			       (if (equal handle preferred) ?* ? )
 			       (if (stringp (car handle))
 				   (car handle)
@@ -2725,9 +3251,7 @@ If ALL-HEADERS is non-nil, no headers are hidden."
 	(when preferred
 	  (if (stringp (car preferred))
 	      (gnus-display-mime preferred)
-	    (let ((rfc2047-default-charset gnus-newsgroup-default-charset)
-		  (mm-charset-iso-8859-1-forced 
-		   gnus-newsgroup-iso-8859-1-forced))
+	    (let ((mail-parse-charset gnus-newsgroup-charset))
 	      (mm-display-part preferred)))
 	  (goto-char (point-max))
 	  (setcdr begend (point-marker)))))
@@ -2739,13 +3263,13 @@ If ALL-HEADERS is non-nil, no headers are hidden."
   (save-excursion
     (set-buffer gnus-article-buffer)
     (let ((cite (gnus-article-hidden-text-p 'cite))
-	  (headers (gnus-article-hidden-text-p 'headers))
-	  (boring (gnus-article-hidden-text-p 'boring-headers))
-	  (pgp (gnus-article-hidden-text-p 'pgp))
-	  (pem (gnus-article-hidden-text-p 'pem))
-	  (signature (gnus-article-hidden-text-p 'signature))
-	  (overstrike (gnus-article-hidden-text-p 'overstrike))
-	  (emphasis (gnus-article-hidden-text-p 'emphasis))
+ 	  (headers (gnus-article-hidden-text-p 'headers))
+ 	  (boring (gnus-article-hidden-text-p 'boring-headers))
+ 	  (pgp (gnus-article-hidden-text-p 'pgp))
+ 	  (pem (gnus-article-hidden-text-p 'pem))
+ 	  (signature (gnus-article-hidden-text-p 'signature))
+ 	  (overstrike (gnus-article-hidden-text-p 'overstrike))
+ 	  (emphasis (gnus-article-hidden-text-p 'emphasis))
 	  (mime gnus-show-mime))
       (format "%c%c%c%c%c%c%c"
 	      (if cite ?c ? )
@@ -2761,9 +3285,11 @@ If ALL-HEADERS is non-nil, no headers are hidden."
 (defun gnus-article-maybe-hide-headers ()
   "Hide unwanted headers if `gnus-have-all-headers' is nil.
 Provided for backwards compatibility."
-  (or (save-excursion (set-buffer gnus-summary-buffer) gnus-have-all-headers)
-      gnus-inhibit-hiding
-      (gnus-article-hide-headers)))
+  (when (and (or (not (gnus-buffer-live-p gnus-summary-buffer))
+		 (not (save-excursion (set-buffer gnus-summary-buffer)
+				      gnus-have-all-headers)))
+	     (not gnus-inhibit-hiding))
+    (gnus-article-hide-headers)))
 
 ;;; Article savers.
 
@@ -2904,8 +3430,7 @@ Argument LINES specifies lines to be scrolled down."
 (defun gnus-article-describe-briefly ()
   "Describe article mode commands briefly."
   (interactive)
-  (gnus-message 6
-		(substitute-command-keys "\\<gnus-article-mode-map>\\[gnus-article-goto-next-page]:Next page	 \\[gnus-article-goto-prev-page]:Prev page  \\[gnus-article-show-summary]:Show summary  \\[gnus-info-find-node]:Run Info  \\[gnus-article-describe-briefly]:This help")))
+  (gnus-message 6 (substitute-command-keys "\\<gnus-article-mode-map>\\[gnus-article-goto-next-page]:Next page	 \\[gnus-article-goto-prev-page]:Prev page  \\[gnus-article-show-summary]:Show summary  \\[gnus-info-find-node]:Run Info  \\[gnus-article-describe-briefly]:This help")))
 
 (defun gnus-article-summary-command ()
   "Execute the last keystroke in the summary buffer."
@@ -2930,7 +3455,7 @@ Argument LINES specifies lines to be scrolled down."
 
 (defun gnus-article-check-buffer ()
   "Beep if not in an article buffer."
-  (unless (equal major-mode 'gnus-article-mode)
+  (unless (eq (get-buffer gnus-article-buffer) (current-buffer))
     (error "Command invoked outside of a Gnus article buffer")))
 
 (defun gnus-article-read-summary-keys (&optional arg key not-restore-window)
@@ -2994,9 +3519,12 @@ Argument LINES specifies lines to be scrolled down."
           (set-buffer obuf)
           (unless not-restore-window
             (set-window-configuration owin))
-          (unless (or (not (eq selected 'old)) (member keys up-to-top))
+          (when (eq selected 'old)
+	    (article-goto-body)
+            (set-window-start (get-buffer-window (current-buffer))
+                              1)
             (set-window-point (get-buffer-window (current-buffer))
-                              opoint))
+                              (point)))
           (let ((win (get-buffer-window gnus-article-current-summary)))
             (when win
               (set-window-point win new-sum-point))))))))
@@ -3224,18 +3752,21 @@ groups."
     (error "The current newsgroup does not support article editing"))
   (gnus-article-date-original)
   (gnus-article-edit-article
+   'ignore
    `(lambda (no-highlight)
+      'ignore
       (gnus-summary-edit-article-done
        ,(or (mail-header-references gnus-current-headers) "")
        ,(gnus-group-read-only-p) ,gnus-summary-buffer no-highlight))))
 
-(defun gnus-article-edit-article (exit-func)
+(defun gnus-article-edit-article (start-func exit-func)
   "Start editing the contents of the current article buffer."
   (let ((winconf (current-window-configuration)))
     (set-buffer gnus-article-buffer)
     (gnus-article-edit-mode)
-    (gnus-article-delete-text-of-type 'annotation)
-    (gnus-set-text-properties (point-min) (point-max) nil)
+    (funcall start-func)
+    ;;(gnus-article-delete-text-of-type 'annotation)
+    ;;(gnus-set-text-properties (point-min) (point-max) nil)
     (gnus-configure-windows 'edit-article)
     (setq gnus-article-edit-done-function exit-func)
     (setq gnus-prev-winconf winconf)
@@ -3585,7 +4116,7 @@ do the highlighting.  See the documentation for those functions."
 	    (case-fold-search t)
 	    (inhibit-point-motion-hooks t)
 	    entry regexp header-face field-face from hpoints fpoints)
-	(message-narrow-to-head)
+	(article-narrow-to-head)
 	(while (setq entry (pop alist))
 	  (goto-char (point-min))
 	  (setq regexp (concat "^\\("
@@ -3686,38 +4217,38 @@ specified by `gnus-button-alist'."
   (interactive)
   (save-excursion
     (set-buffer gnus-article-buffer)
-    (let ((buffer-read-only nil)
-	  (inhibit-point-motion-hooks t)
-	  (case-fold-search t)
-	  (alist gnus-header-button-alist)
-	  entry beg end)
-      (nnheader-narrow-to-headers)
-      (while alist
-	;; Each alist entry.
-	(setq entry (car alist)
-	      alist (cdr alist))
-	(goto-char (point-min))
-	(while (re-search-forward (car entry) nil t)
-	  ;; Each header matching the entry.
-	  (setq beg (match-beginning 0))
-	  (setq end (or (and (re-search-forward "^[^ \t]" nil t)
-			     (match-beginning 0))
-			(point-max)))
-	  (goto-char beg)
-	  (while (re-search-forward (nth 1 entry) end t)
-	    ;; Each match within a header.
-	    (let* ((entry (cdr entry))
-		   (start (match-beginning (nth 1 entry)))
-		   (end (match-end (nth 1 entry)))
-		   (form (nth 2 entry)))
-	      (goto-char (match-end 0))
-	      (when (eval form)
-		(gnus-article-add-button
-		 start end (nth 3 entry)
-		 (buffer-substring (match-beginning (nth 4 entry))
-				   (match-end (nth 4 entry)))))))
-	  (goto-char end))))
-    (widen)))
+    (save-restriction
+      (let ((buffer-read-only nil)
+	    (inhibit-point-motion-hooks t)
+	    (case-fold-search t)
+	    (alist gnus-header-button-alist)
+	    entry beg end)
+	(article-narrow-to-head)
+	(while alist
+	  ;; Each alist entry.
+	  (setq entry (car alist)
+		alist (cdr alist))
+	  (goto-char (point-min))
+	  (while (re-search-forward (car entry) nil t)
+	    ;; Each header matching the entry.
+	    (setq beg (match-beginning 0))
+	    (setq end (or (and (re-search-forward "^[^ \t]" nil t)
+			       (match-beginning 0))
+			  (point-max)))
+	    (goto-char beg)
+	    (while (re-search-forward (nth 1 entry) end t)
+	      ;; Each match within a header.
+	      (let* ((entry (cdr entry))
+		     (start (match-beginning (nth 1 entry)))
+		     (end (match-end (nth 1 entry)))
+		     (form (nth 2 entry)))
+		(goto-char (match-end 0))
+		(when (eval form)
+		  (gnus-article-add-button
+		   start end (nth 3 entry)
+		   (buffer-substring (match-beginning (nth 4 entry))
+				     (match-end (nth 4 entry)))))))
+	    (goto-char end)))))))
 
 ;;; External functions:
 
@@ -3973,7 +4504,7 @@ forbidden in URL encoding."
 
 (defvar gnus-decode-header-methods
   '(mail-decode-encoded-word-region)
-  "List of methods used to decode headers
+  "List of methods used to decode headers.
 
 This variable is a list of FUNCTION or (REGEXP . FUNCTION). If item is
 FUNCTION, FUNCTION will be apply to all newsgroups. If item is a
@@ -4009,6 +4540,70 @@ For example:
       (while xlist
 	(funcall (pop xlist) (point-min) (point-max))))))
 
+;;;
+;;; Treatment top-level handling.
+;;;
+
+(defun gnus-treat-article (condition &optional part-number total-parts type)
+  (let ((length (- (point-max) (point-min)))
+	(alist gnus-treatment-function-alist)
+	(article-goto-body-goes-to-point-min-p t)
+	(treated-type
+	 (or (not type)
+	     (catch 'found
+	       (let ((list gnus-article-treat-types))
+		 (while list
+		   (when (string-match (pop list) type)
+		     (throw 'found t)))))))
+	(highlightp (gnus-visual-p 'article-highlight 'highlight))
+	val elem)
+    (gnus-run-hooks 'gnus-part-display-hook)
+    (while (setq elem (pop alist))
+      (setq val (symbol-value (car elem)))
+      (when (and (or (consp val)
+		     treated-type)
+		 (gnus-treat-predicate val)
+		 (or (not (get (car elem) 'highlight))
+		     highlightp))
+	(save-restriction
+	  (funcall (cadr elem)))))))
+
+;; Dynamic variables.
+(defvar part-number)
+(defvar total-parts)
+(defvar type)
+(defvar condition)
+(defvar length)
+(defun gnus-treat-predicate (val)
+  (cond
+   (condition
+    (eq condition val))
+   ((null val)
+    nil)
+   ((eq val t)
+    t)
+   ((eq val 'head)
+    nil)
+   ((eq val 'last)
+    (eq part-number total-parts))
+   ((numberp val)
+    (< length val))
+   ((listp val)
+    (let ((pred (pop val)))
+      (cond
+       ((eq pred 'or)
+	(apply 'gnus-or (mapcar 'gnus-treat-predicate val)))
+       ((eq pred 'and)
+	(apply 'gnus-and (mapcar 'gnus-tread-predicate val)))
+       ((eq pred 'not)
+	(not (gnus-treat-predicate val)))
+       ((eq pred 'typep)
+	(equal (cadr val) type))
+       (t
+	(error "%S is not a valid predicate" pred)))))
+   (t
+    (error "%S is not a valid value" val))))
+
 
 ;;; @ for mime-view
 ;;;
@@ -4022,13 +4617,10 @@ For example:
 	   #'gnus-article-header-presentation-method)
 
 (defun gnus-mime-preview-quitting-method ()
-  (if gnus-show-mime
-      (gnus-article-show-summary)
-    (mime-preview-kill-buffer)
-    (delete-other-windows)
-    (gnus-article-show-summary)
-    (gnus-summary-select-article nil t)
-    ))
+  (mime-preview-kill-buffer)
+  (delete-other-windows)
+  (gnus-article-show-summary)
+  (gnus-summary-select-article gnus-show-all-headers t))
 
 (set-alist 'mime-preview-quitting-method-alist
 	   'gnus-original-article-mode #'gnus-mime-preview-quitting-method)
@@ -4044,6 +4636,18 @@ For example:
 (set-alist 'mime-preview-following-method-alist
 	   'gnus-original-article-mode #'gnus-following-method)
 
+(set-alist 'mime-preview-over-to-previous-method-alist
+	   'gnus-original-article-mode
+	   (lambda ()
+	     (gnus-article-read-summary-keys
+	      nil (gnus-character-to-event ?P))))
+
+(set-alist 'mime-preview-over-to-next-method-alist
+	   'gnus-original-article-mode'
+	   (lambda ()
+	     (gnus-article-read-summary-keys
+	      nil (gnus-character-to-event ?N))))
+
 
 ;;; @ end
 ;;;