From: yamaoka <yamaoka>
Date: Mon, 13 Feb 2006 22:05:42 +0000 (+0000)
Subject: Synch to No Gnus 200602131449.
X-Git-Tag: t-gnus-6_17_4-quimby-~100
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e427fd1da579d58b99d1cad14664f2829971e5b;p=elisp%2Fgnus.git-

Synch to No Gnus 200602131449.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f1232e0..c7355d1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-13  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* gnus-art.el (gnus-article-browse-html-parts):
+	`hs-show-html-list' should read `gnus-article-browse-html-parts'.
+	Don't use suffix argument for mm-make-temp-file for Emacs 21
+	compatibility.  Remove useless `format'.
+
 2006-02-13  Andreas Seltenreich  <uwi7@stud.uni-karlsruhe.de>
 
         * nnweb.el (nnweb-google-wash-article): Update regexps.
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 49ca75e..bc88545 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -2726,16 +2726,19 @@ Recurse into multiparts."
       (when (listp handle)
 	(cond ((and (bufferp (car handle))
 		    (string-match "text/html" (car (mm-handle-type handle))))
-	       (let ((tmp-file (mm-make-temp-file
-				;; Do we need to care for 8.3 filenames?
-				(format "mm-") nil ".html")))
+	       (let ((tmp-file
+		      (concat (mm-make-temp-file
+			       ;; Do we need to care for 8.3 filenames?
+			       (format "mm-") nil)  ".html")))
 		 (mm-save-part-to-file handle tmp-file)
 		 (browse-url tmp-file)
 		 (setq showed t)))
 	      ;; If multipart, recurse
 	      ((and (stringp (car handle))
 		    (string-match "^multipart/" (car handle))
-		    (setq showed (or showed (hs-show-html-list handle))))))))
+		    (setq showed
+			  (or showed
+			      (gnus-article-browse-html-parts handle))))))))
     showed))
 
 ;; TODO: Key binding; Remove temp files.