From: yamaoka <yamaoka>
Date: Wed, 7 Sep 2005 15:18:32 +0000 (+0000)
Subject: Synch to No Gnus 200509071350.
X-Git-Tag: t-gnus-6_17_4-quimby-~386
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99f161c3ed6242803b9c695aa60c64384a79e101;p=elisp%2Fgnus.git-

Synch to No Gnus 200509071350.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 47bd6b9..b2538ae 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2005-09-07  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* nnweb.el (nnweb-google-wash-article): Print a message if article
+	is not available.
+
+2005-09-07  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* gnus-art.el (gnus-mime-display-single): Revert 2004-10-07
+	change.  Decode text/* parts content before displaying.
+
 2005-09-06  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* mm-view.el (mm-display-inline-fontify): Disable support modes.
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 3c200b0..4816bb3 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -5318,7 +5318,14 @@ If displaying \"text/html\" is discouraged \(see
 	      (forward-line -1)
 	      (setq beg (point)))
 	    (gnus-article-insert-newline)
-	    (mm-display-inline handle)
+	    (mm-insert-inline handle
+			      (let ((charset
+				     (mail-content-type-get
+				      (mm-handle-type handle) 'charset)))
+				(if (eq charset 'gnus-decoded)
+				    (mm-get-part handle)
+				  (mm-decode-string (mm-get-part handle)
+						    charset))))
 	    (goto-char (point-max))))
 	  ;; Do highlighting.
 	  (save-excursion
diff --git a/lisp/nnweb.el b/lisp/nnweb.el
index 2e7c315..94a4114 100644
--- a/lisp/nnweb.el
+++ b/lisp/nnweb.el
@@ -319,12 +319,22 @@ Valid types include `google', `dejanews', and `gmane'.")
   ;; We have Google's masked e-mail addresses here.  :-/
   (let ((case-fold-search t))
     (goto-char (point-min))
-    (delete-region (point-min)
-		   (1+ (re-search-forward "^<pre>" nil t)))
-    (goto-char (point-min))
-    (delete-region (- (re-search-forward "^</pre>" nil t) (length "</pre>"))
-		   (point-max))
-    (mm-url-decode-entities)))
+    (if (save-excursion
+	  (or (re-search-forward "The requested message.*could not be found."
+				 nil t)
+	      (not (and (re-search-forward "^<pre>" nil t)
+			(re-search-forward "^</pre>" nil t)))))
+	;; FIXME: Don't know how to indicate "not found".
+	;; Should this function throw an error?  --rsteib
+	(progn
+	  (gnus-message 3 "Requested article not found")
+	  (erase-buffer))
+      (delete-region (point-min)
+		     (1+ (re-search-forward "^<pre>" nil t)))
+      (goto-char (point-min))
+      (delete-region (- (re-search-forward "^</pre>" nil t) (length "</pre>"))
+		     (point-max))
+      (mm-url-decode-entities))))
 
 (defun nnweb-google-parse-1 (&optional Message-ID)
   (let ((i 0)