Reference mm-shr in various places

Signed-off-by: Julien Danjou <julien@danjou.info>

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3a2619c..fb5f1e2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-08  Julien Danjou  <julien@danjou.info>
+
+       * mm-decode.el (mm-text-html-renderer): Add mm-shr in choice list.
+
 2010-10-08  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * gnus-util.el (gnus-alist-pull): Rename `gnus-pull'.

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 1006c85..07249bf 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -115,6 +115,7 @@
   "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;
 `w3m'  : use emacs-w3m;
 `w3m-standalone': use w3m;
@@ -124,7 +125,8 @@ The defined renderer types are:
 `html2text' : use html2text;
 nil    : use external viewer (default web browser)."
   :version "24.1"
-  :type '(choice (const gnus-article-html)
+  :type '(choice (const mm-shr)
+                 (const gnus-article-html)
                  (const w3)
                  (const w3m :tag "emacs-w3m")
                 (const w3m-standalone :tag "standalone w3m" )

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 09d8f9e..665fcad 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-08  Julien Danjou  <julien@danjou.info>
+
+       * gnus.texi: add mm-shr
+
 2010-10-08  Ludovic Courtès <ludo@gnu.org>
 
        * gnus.texi (Finding the Parent, The Gnus Registry)

diff --git a/texi/gnus.texi b/texi/gnus.texi
index b16ccac..cc54fa4 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -9811,6 +9811,10 @@ Customization, emacs-mime, The Emacs MIME Manual}) to convert the
 @code{gnus-article-wash-function} variable.  Pre-defined functions you
 can use include:
 
+@table @code
+@item mm-shr
+Use Gnus simple html renderer.
+
 @table @code
 @item gnus-article-html
 Use Gnus rendered based on w3m.
@@ -12455,7 +12459,7 @@ section only describes the default method.
 @item mm-text-html-renderer
 @vindex mm-text-html-renderer
 If set to @code{gnus-article-html}, Gnus will use the built-in method,
-that's based on @code{curl} and @code{w3m}.
+that's based on @code{w3m}.
 
 @item gnus-blocked-images
 @vindex gnus-blocked-images