From a372989fb09796f32152671603745547520c0682 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Wed, 23 Apr 2003 13:10:34 +0000
Subject: [PATCH] Synch to Oort Gnus 200304231304.

---
 lisp/ChangeLog    |    8 ++++++++
 lisp/mm-bodies.el |   12 +++---------
 lisp/mml.el       |    9 +++++++++
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c4de774..238c786 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2003-04-23  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* mml.el (mml-preview): Bind `=', RET, and mouse-2.
+
+2003-04-23  Jesper Harder  <harder@ifa.au.dk>
+
+	* mm-bodies.el (mm-decode-body): Don't override supplied charset.
+
 2003-04-23  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* dgnushack.el (merge, copy-list): Remove compiler macros.
diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el
index 9a7d7b5..ee14049 100644
--- a/lisp/mm-bodies.el
+++ b/lisp/mm-bodies.el
@@ -266,18 +266,12 @@ use the supplied charset unconditionally."
 			 (setq coding-system mail-parse-charset))
 		     (not (eq coding-system 'gnus-decoded)))
 	    (if (or force
-		    ;; If a charset was supplied and `code-pages'
-		    ;; hasn't been loaded, then use the supplied
-		    ;; charset unconditionally.
-		    (and (not (featurep 'code-pages))
-			 charset-supplied))
+		    ;; If a charset was supplied, then use the
+		    ;; supplied charset unconditionally.
+		    charset-supplied)
 		(mm-decode-coding-region (point-min) (point-max)
 					 coding-system)
 	      ;; Otherwise allow Emacs to auto-detect the charset.
-	      ;; Messages in windows-125x are frequently incorrectly
-	      ;; advertised as iso-8859-x -- if `code-pages' has been
-	      ;; loaded and configured, we're able to deal with them
-	      ;; properly.
 	      (mm-decode-coding-region-safely (point-min) (point-max)
 					      coding-system)))
 	  (setq buffer-file-coding-system
diff --git a/lisp/mml.el b/lisp/mml.el
index 703aa1b..4bc96eb 100644
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -1076,6 +1076,15 @@ If RAW, don't highlight the article."
 		  (mm-destroy-parts gnus-article-mime-handles)) nil t)
       (setq buffer-read-only t)
       (local-set-key "q" (lambda () (interactive) (kill-buffer nil)))
+      (local-set-key "=" (lambda () (interactive) (delete-other-windows)))
+      (local-set-key "\r"
+		     (lambda ()
+		       (interactive)
+		       (widget-button-press (point))))
+      (local-set-key gnus-mouse-2
+		     (lambda (event)
+		       (interactive "@e")
+		       (widget-button-press (widget-event-point event) event)))
       (goto-char (point-min)))))
 
 (defun mml-validate ()
-- 
1.7.10.4