Changes committed gnus/lisp (ChangeLog mm-decode.el)

Modified: ChangeLog mm-decode.el

(mm-text-html-renderer): Prefer w3m over w3.  Fall back to nil, instead of
html2text.


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.1770 gnus/lisp/ChangeLog:7.1771
--- ChangeLog:7.1770	Sun Mar  2 17:55:00 2008
+++ ChangeLog	Sun Mar  2 18:07:02 2008
@@ -1,5 +1,8 @@
 2008-03-02  Reiner Steib  <[email protected]>
 
+	* mm-decode.el (mm-text-html-renderer): Prefer w3m over w3.  Fall back
+	to nil, instead of html2text.
+
 	* imap.el (imap-debug): Add `imap-ping-server'.
 
 	* gnus-bookmark.el: Add FIXMEs.
Index: mm-decode.el
diff -u gnus/lisp/mm-decode.el:7.63 gnus/lisp/mm-decode.el:7.64
--- mm-decode.el:7.63	Sat Mar  1 02:48:13 2008
+++ mm-decode.el	Sun Mar  2 18:07:02 2008
@@ -106,31 +106,33 @@
 	 ,disposition ,description ,cache ,id))
 
 (defcustom mm-text-html-renderer
-  (cond ((locate-library "w3") 'w3)
-	((executable-find "w3m") (if (locate-library "w3m")
-				     'w3m
-				   'w3m-standalone))
+  (cond ((executable-find "w3m")
+	 (if (locate-library "w3m")
+	     'w3m
+	   'w3m-standalone))
 	((executable-find "links") 'links)
 	((executable-find "lynx") 'lynx)
-	(t 'html2text))
+	((locate-library "w3") 'w3)
+	((locate-library "html2text") 'html2text)
+	(t nil))
   "Render of HTML contents.
 It is one of defined renderer types, or a rendering function.
 The defined renderer types are:
-`w3'   : use Emacs/W3;
 `w3m'  : use emacs-w3m;
 `w3m-standalone': use w3m;
 `links': use links;
 `lynx' : use lynx;
+`w3'   : use Emacs/W3;
 `html2text' : use html2text;
-nil    : use external viewer."
-  :version "22.1"
+nil    : use external viewer (default web browser)."
+  :version "23.0" ;; No Gnus
   :type '(choice (const w3)
-		 (const w3m)
-		 (const w3m-standalone)
+		 (const w3m :tag "emacs-w3m")
+		 (const w3m-standalone :tag "standalone w3m" )
 		 (const links)
 		 (const lynx)
 		 (const html2text)
-		 (const nil)
+		 (const nil :tag "External viewer")
 		 (function))
   :group 'mime-display)