* gnus-art.el (article-wash-html): Bind url-gateway-unplugged.

* mm-view.el (mm-w3-prepare-buffer): Ditto.
(mm-inline-text): Ditto.
Suggested by  Dave Love <[email protected]>.

* mml.el (mml-preview): Disable local map.

* mml.el (mml-preview): Bind `q'.

4 files changed, 20 insertions, 5 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 0d15ec4b4d..95eee15d47 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,14 @@
+2002-02-07  ShengHuo ZHU  <[email protected]>
+
+	* gnus-art.el (article-wash-html): Bind url-gateway-unplugged. 
+	* mm-view.el (mm-w3-prepare-buffer): Ditto.
+	(mm-inline-text): Ditto.
+	Suggested by  Dave Love <[email protected]>.
+
+	* mml.el (mml-preview): Disable local map.
+
+	* mml.el (mml-preview): Bind `q'.
+	
 2002-02-05  Pavel Jan,Bm(Bk  <[email protected]>
 
 	* binhex.el (binhex-decoder-switches): Doc fix.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index f4a1a88f41..98075c940e 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -1667,6 +1667,7 @@ If FORCE, decode the article whether it is marked as base64 not."
 	  (narrow-to-region (point) (point-max))
 	  (mm-setup-w3)
 	  (let ((w3-strict-width (window-width))
+		(url-gateway-unplugged t)
 		(url-standalone-mode t))
 	    (condition-case var
 		(w3-region (point-min) (point-max))
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index 2fa24a7285..707bd70845 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -89,6 +89,7 @@
       (setq text (mm-get-part handle))
       (let ((b (point))
 	    (url-standalone-mode t)
+	    (url-gateway-unplugged t)
 	    (url-current-object
 	     (url-generic-parse-url (format "cid:%s" (mm-handle-id handle))))
 	    (width (window-width))
@@ -120,8 +121,7 @@
 		(let ((w3-strict-width width)
 		      ;; Don't let w3 set the global version of
 		      ;; this variable.
-		      (fill-column fill-column)
-		      (url-standalone-mode t))
+		      (fill-column fill-column))
 		  (condition-case var
 		      (w3-region (point-min) (point-max))
 		    (error
@@ -214,7 +214,8 @@
 
 (defun mm-w3-prepare-buffer ()
   (require 'w3)
-  (let ((url-standalone-mode t))
+  (let ((url-standalone-mode t)
+	(url-gateway-unplugged t))
     (w3-prepare-buffer)))
 
 (defun mm-view-message ()
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index d2beef9fa5..e28fa1e9e1 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -1,5 +1,5 @@
 ;;; mml.el --- package for parsing and validating MML documents
-;; Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <[email protected]>
 ;; This file is part of GNU Emacs.
@@ -854,8 +854,10 @@ If RAW, don't highlight the article."
 	(run-hooks 'gnus-article-decode-hook)
 	(let ((gnus-newsgroup-name "dummy"))
 	  (gnus-article-prepare-display))))
-    (fundamental-mode)
+    ;; Disable article-mode-map.
+    (use-local-map nil)
     (setq buffer-read-only t)
+    (local-set-key "q" (lambda () (interactive) (kill-buffer nil)))
     (goto-char (point-min))))
 
 (defun mml-validate ()