Use shr and gnus-w3m symbols for `mm-text-html-renderer', like the other options.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 597fc91..de28bc7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,11 @@
 2010-10-20  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * mm-view.el (mm-text-html-renderer-alist): Add the `shr' and
+       `gnus-w3m' symbols.
+
        * mm-decode.el (mm-inline-text-html-renderer): Removed.
        (mm-inline-media-tests): Removed use.
+       (mm-text-html-renderer): Change default to the `shr' symbol.
 
        * mm-view.el (mm-inline-text-html): Removed use.
 

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 6e8241e..5b79b20 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -105,8 +105,8 @@
         ,disposition ,description ,cache ,id))
 
 (defcustom mm-text-html-renderer
-  (cond ((fboundp 'libxml-parse-html-region) 'mm-shr)
-       ((executable-find "w3m") 'gnus-article-html)
+  (cond ((fboundp 'libxml-parse-html-region) 'shr)
+       ((executable-find "w3m") 'gnus-w3m)
        ((executable-find "links") 'links)
        ((executable-find "lynx") 'lynx)
        ((locate-library "w3") 'w3)
@@ -115,8 +115,8 @@
   "Render of HTML contents.
 It is one of defined renderer types, or a rendering function.
 The defined renderer types are:
-`mm-shr': use Gnus simple HTML renderer;
-`gnus-article-html' : use Gnus renderer based on w3m;
+`shr': use Gnus simple HTML renderer;
+`gnus-w3m' : use Gnus renderer based on w3m;
 `w3m'  : use emacs-w3m;
 `w3m-standalone': use w3m;
 `links': use links;
@@ -125,8 +125,8 @@ The defined renderer types are:
 `html2text' : use html2text;
 nil    : use external viewer (default web browser)."
   :version "24.1"
-  :type '(choice (const mm-shr)
-                 (const gnus-article-html)
+  :type '(choice (const shr)
+                 (const gnus-w3m)
                  (const w3)
                  (const w3m :tag "emacs-w3m")
                 (const w3m-standalone :tag "standalone w3m" )

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 19421df..5866b81 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -50,9 +50,11 @@
 (defvar w3m-minor-mode-map)
 
 (defvar mm-text-html-renderer-alist
-  '((w3  . mm-inline-text-html-render-with-w3)
+  '((shr . mm-shr)
+    (w3  . mm-inline-text-html-render-with-w3)
     (w3m . mm-inline-text-html-render-with-w3m)
     (w3m-standalone . mm-inline-text-html-render-with-w3m-standalone)
+    (gnus-w3m . gnus-article-html)
     (links mm-inline-render-with-file
           mm-links-remove-leading-blank
           "links" "-dump" file)