Synch to No Gnus 200405232318.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b07d923..3afa6a8 100644 (file)
--- 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 (file)
--- 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))