From: yamaoka <yamaoka>
Date: Sun, 23 May 2004 23:21:29 +0000 (+0000)
Subject: Synch to No Gnus 200405232318.
X-Git-Tag: t-gnus-6_17_4-quimby-~902
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2dc9c8cb17411bcd862b42ed22f1e29023859920;p=elisp%2Fgnus.git-

Synch to No Gnus 200405232318.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b07d923..3afa6a8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mm-decode.el (mm-text-html-renderer): Make sure w3m exists in
+	addition to emacs-w3m.
+
 2004-05-23  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* assistant.el (assistant-authinfo-data): New function.
diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 67b040e..de879ca 100644
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -98,8 +98,9 @@
 
 (defcustom mm-text-html-renderer
   (cond ((locate-library "w3") 'w3)
-	((locate-library "w3m") 'w3m)
-	((executable-find "w3m") 'w3m-standalone)
+	((executable-find "w3m") (if (locate-library "w3m")
+				     'w3m
+				   'w3m-standalone))
 	((executable-find "links") 'links)
 	((executable-find "lynx") 'lynx)
 	(t 'html2text))