From ecc647d0118619dd87e9ee43f53ac7ad5a012250 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Sun, 14 Aug 2022 16:28:25 +0200 Subject: [PATCH] Don't advertise obsolete library html2text.el * doc/misc/emacs-mime.texi (Display Customization): * doc/misc/gnus-faq.texi (FAQ 4-7): * doc/misc/gnus.texi (Article Washing): * doc/misc/mh-e.texi (HTML): * lisp/gnus/mm-decode.el (mm-text-html-renderer): Don't advertise obsolete library html2text.el. --- doc/misc/emacs-mime.texi | 6 +++--- doc/misc/gnus-faq.texi | 6 +++--- doc/misc/gnus.texi | 3 --- doc/misc/mh-e.texi | 7 ------- lisp/gnus/mm-decode.el | 9 +++------ 5 files changed, 9 insertions(+), 22 deletions(-) diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi index 640712edf33..5f4e1a639be 100644 --- a/doc/misc/emacs-mime.texi +++ b/doc/misc/emacs-mime.texi @@ -403,9 +403,9 @@ This selects the function used to render @acronym{HTML}. The predefined renderers are selected by the symbols @code{shr}, @code{gnus-w3m}, @code{w3m}@footnote{See @uref{http://emacs-w3m.namazu.org/} for more information about -emacs-w3m}, @code{links}, @code{lynx}, @code{w3m-standalone} or -@code{html2text}. You can also specify a function, which will be -called with a @acronym{MIME} handle as the argument. +emacs-w3m}, @code{links}, @code{lynx}, or @code{w3m-standalone}. You +can also specify a function, which will be called with a +@acronym{MIME} handle as the argument. @item mm-html-inhibit-images @vindex mm-html-inhibit-images diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi index 544d6279847..c442ca1bacd 100644 --- a/doc/misc/gnus-faq.texi +++ b/doc/misc/gnus-faq.texi @@ -745,9 +745,9 @@ Can I use some other browser than w3m to render my HTML-mails? @subsubheading Answer You've got the choice between @samp{shr}, @samp{w3m}, @samp{links}, -@samp{lynx} and @samp{html2text}. Which one is used is specified in -the variable @code{mm-text-html-renderer}, so if you want links to -render your mail, say: +and @samp{lynx}. Which one is used is specified in the variable +@code{mm-text-html-renderer}, so if you want links to render your +mail, say: @example (setq mm-text-html-renderer 'links) diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index baffe369c3e..204c6c6e598 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -9362,9 +9362,6 @@ Use @uref{https://almende.github.io/chap-links-library/, CHAP Links}. @item lynx Use @uref{https://lynx.browser.org/, Lynx}. -@item html2text -Use html2text---a simple @acronym{HTML} converter included with Gnus. - @end table @item W D F diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi index 83d81fc12dc..6a948ce2ca8 100644 --- a/doc/misc/mh-e.texi +++ b/doc/misc/mh-e.texi @@ -2553,13 +2553,6 @@ produces pretty nice output, and it highlights links. It renders @samp{–} and @samp{®} okay. It sometimes fails to wrap lines properly. It always downloads remote images. @c ------------------------- -@cindex browser, @samp{html2text} -@cindex @samp{html2text} -@item @samp{html2text} -The @samp{html2text} browser requires an external program. Some users -have reported problems with it, such as filling the entire message as -if it were one paragraph, or displaying chunks of raw HTML. -@c ------------------------- @cindex browser, @samp{links} @cindex @samp{links} @item @samp{links} diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index 79217d34001..1417ecdccc8 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/mm-decode.el @@ -117,8 +117,7 @@ (cond ((fboundp 'libxml-parse-html-region) 'shr) ((executable-find "w3m") 'gnus-w3m) ((executable-find "links") 'links) - ((executable-find "lynx") 'lynx) - ((locate-library "html2text") 'html2text)) + ((executable-find "lynx") 'lynx)) "Render of HTML contents. It is one of defined renderer types, or a rendering function. The defined renderer types are: @@ -127,16 +126,14 @@ The defined renderer types are: `w3m': use emacs-w3m; `w3m-standalone': use plain w3m; `links': use links; -`lynx': use lynx; -`html2text': use html2text." - :version "27.1" +`lynx': use lynx." + :version "29.1" :type '(choice (const shr) (const gnus-w3m) (const w3m :tag "emacs-w3m") (const w3m-standalone :tag "standalone w3m" ) (const links) (const lynx) - (const html2text) (function)) :group 'mime-display) -- 2.39.5