summaryrefslogtreecommitdiff
path: root/lisp/gnus/mm-decode.el
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2018-04-12 19:18:26 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2018-04-12 19:18:26 +0200
commit17174d3f77fe6d5103bfe7e858035a0038010522 (patch)
treebf4e6b031095daa453a4223a6152f77df4f4b184 /lisp/gnus/mm-decode.el
parent4616ddc1316f9e25429ab932bf87149dc578381d (diff)
downloademacs-17174d3f77fe6d5103bfe7e858035a0038010522.tar.gz
nil is no longer an allowed value for mm-inline-text-html
* doc/misc/emacs-mime.texi (Display Customization): Remove the doc for the nil case of mm-inline-text-html. * doc/misc/mh-e.texi (HTML): Ditto. * lisp/gnus/mm-view.el (mm-inline-text-html): If no mm-text-html-renderer is specified, just insert the raw text instead of erroring out (bug#30870).
Diffstat (limited to 'lisp/gnus/mm-decode.el')
-rw-r--r--lisp/gnus/mm-decode.el9
1 files changed, 3 insertions, 6 deletions
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index f55a6af8027..7ab84c0c83d 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -118,8 +118,7 @@
((executable-find "w3m") 'gnus-w3m)
((executable-find "links") 'links)
((executable-find "lynx") 'lynx)
- ((locate-library "html2text") 'html2text)
- (t nil))
+ ((locate-library "html2text") 'html2text))
"Render of HTML contents.
It is one of defined renderer types, or a rendering function.
The defined renderer types are:
@@ -129,9 +128,8 @@ The defined renderer types are:
`w3m-standalone': use plain w3m;
`links': use links;
`lynx': use lynx;
-`html2text': use html2text;
-nil : use external viewer (default web browser)."
- :version "24.1"
+`html2text': use html2text."
+ :version "27.1"
:type '(choice (const shr)
(const gnus-w3m)
(const w3m :tag "emacs-w3m")
@@ -139,7 +137,6 @@ nil : use external viewer (default web browser)."
(const links)
(const lynx)
(const html2text)
- (const nil :tag "External viewer")
(function))
:group 'mime-display)