From 849dc22b9a764b273fb729cab3858dff0e6ad22f Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Fri, 8 Oct 2010 20:50:42 +0200 Subject: [PATCH] Reference mm-shr in various places Signed-off-by: Julien Danjou --- lisp/ChangeLog | 4 ++++ lisp/mm-decode.el | 4 +++- texi/ChangeLog | 4 ++++ texi/gnus.texi | 6 +++++- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3a2619c09..fb5f1e250 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-10-08 Julien Danjou + + * mm-decode.el (mm-text-html-renderer): Add mm-shr in choice list. + 2010-10-08 Teodor Zlatanov * gnus-util.el (gnus-alist-pull): Rename `gnus-pull'. diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el index 1006c850a..07249bf07 100644 --- 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 09d8f9e6a..665fcad27 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,7 @@ +2010-10-08 Julien Danjou + + * gnus.texi: add mm-shr + 2010-10-08 Ludovic Courtès * gnus.texi (Finding the Parent, The Gnus Registry) diff --git a/texi/gnus.texi b/texi/gnus.texi index b16ccac6b..cc54fa436 100644 --- 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 -- 2.25.1