From: yamaoka Date: Tue, 10 Jan 2006 10:13:38 +0000 (+0000) Subject: Synch to No Gnus 200601101013. X-Git-Tag: t-gnus-6_17_4-quimby-~156 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec20115936dc2a6e215a47941381f429f58d42a3;p=elisp%2Fgnus.git- Synch to No Gnus 200601101013. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c638188..7dde792 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2006-01-10 Katsumi Yamaoka + + * nnrss.el (nnrss-wash-html-in-text-plain-parts): New variable. + (nnrss-request-article): Render text/plain parts as HTML. + + * gnus-art.el (gnus-article-wash-html-with-w3m): No need to narrow + the buffer. + 2006-01-05 Katsumi Yamaoka * nnrss.el (nnrss-request-article): Fix the way to fill text/plain diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 5d43915..0152653 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -2681,19 +2681,17 @@ If READ-CHARSET, ask for a coding system." (defun gnus-article-wash-html-with-w3m () "Wash the current buffer with emacs-w3m." (mm-setup-w3m) - (save-restriction - (narrow-to-region (point) (point-max)) - (let ((w3m-safe-url-regexp mm-w3m-safe-url-regexp) - w3m-force-redisplay) - (w3m-region (point-min) (point-max))) - (when (and mm-inline-text-html-with-w3m-keymap - (boundp 'w3m-minor-mode-map) - w3m-minor-mode-map) - (add-text-properties - (point-min) (point-max) - (list 'keymap w3m-minor-mode-map - ;; Put the mark meaning this part was rendered by emacs-w3m. - 'mm-inline-text-html-with-w3m t))))) + (let ((w3m-safe-url-regexp mm-w3m-safe-url-regexp) + w3m-force-redisplay) + (w3m-region (point-min) (point-max))) + (when (and mm-inline-text-html-with-w3m-keymap + (boundp 'w3m-minor-mode-map) + w3m-minor-mode-map) + (add-text-properties + (point-min) (point-max) + (list 'keymap w3m-minor-mode-map + ;; Put the mark meaning this part was rendered by emacs-w3m. + 'mm-inline-text-html-with-w3m t)))) (defun article-hide-list-identifiers () "Remove list identifies from the Subject header. diff --git a/lisp/nnrss.el b/lisp/nnrss.el index 44f18ed..bf074ef 100644 --- a/lisp/nnrss.el +++ b/lisp/nnrss.el @@ -93,9 +93,15 @@ ARTICLE is the article number of the current headline.") (defvar nnrss-compatible-encoding-alist '((iso-8859-1 . windows-1252)) "Alist of encodings and those supersets. The cdr of each element is used to decode data if it is available when -the car is what the data specify as the encoding. Or, the car is used +the car is what the data specify as the encoding. Or, the car is used for decoding when the cdr that the data specify is not available.") +(defvar nnrss-wash-html-in-text-plain-parts nil + "*Non-nil means render text in text/plain parts as HTML. +The function specified by the `mm-text-html-renderer' variable will be +used to render text. If it is nil, text will simply be folded. This +variable is not used in T-gnus.") + (nnoo-define-basics nnrss) ;;; Interface functions diff --git a/texi/ChangeLog b/texi/ChangeLog index a0fb572..774fdfe 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,7 @@ +2006-01-10 Katsumi Yamaoka + + * gnus.texi (RSS): Document nnrss-wash-html-in-text-plain-parts. + 2006-01-06 Katsumi Yamaoka * gnus.texi (Group Parameters): Fix description. diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 3d193bb..ceb0f6b 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -15604,6 +15604,15 @@ system $B$G%(%s%3!<%I$5$l$^$9!#$=$l$,(B @code{nil} $B$G$"$k$H!"(BEmacs $B$G @code{nnmail-pathname-coding-system} $BJQ?t$NCM$rE,@Z$K@_Dj$7$J$1$l$P$J$j(B $B$^$;$s!#(B +@code{nnrss} $B%P%C%/%(%s%I$O(B @samp{text/plain} $B$+(B @samp{text/html} $B$N5-;v(B +$B$r:n$j$^$9!#$I$A$i$r:n$k$+$O(B @code{mime-preview-condition} $BJQ?t$NCM$K$h$C(B +$B$F7h$^$j$^$9!#$b$7(B @uref{http://emacs-w3m.namazu.org/, emacs-w3m} $B$K4^$^(B +$B$l$F$$$k(B @code{mime-w3m} $B%b%8%e!<(B +$B%k(B (@pxref{SEMI MUAs, ,@acronym{SEMI} MUA $B$G(B HTML $B%a!<%k$rFI$`(B, +emacs-w3m-ja, Emacs-w3m-ja}) $B$r;H$C$F$$$k$N$J$i$P!"(B@samp{text/html} $B$N5-(B +$B;v$r:n$k$h$&$K!"<+F0E*$K(B @code{mime-preview-condition} $BJQ?t$,@_Dj$5$l$k(B +$B$G$7$g$&!#(B + @cindex OPML $B$"$J$?$N9VFIL\O?$r(B @acronym{OPML} $B%U%)!<%^%C%H(B (Outline Processor Markup Language) $B$G%m!<%I(B/$B%;!<%V$9$k$?$a$K!"0J2<$N%3%^%s%I$r;H$&$3$H$b$G$-$^$9!#(B @@ -15680,15 +15689,6 @@ Language) $B$G%m!<%I(B/$B%;!<%V$9$k$?$a$K!"0J2<$N%3%^%s%I$r;H$&$3$H$b$G$-$^$9 (add-to-list 'nnmail-extra-headers nnrss-url-field) @end lisp -@code{nnrss} $B%P%C%/%(%s%I$O(B @samp{text/plain} $B$+(B @samp{text/html} $B$N5-;v(B -$B$r:n$j$^$9!#$I$A$i$r:n$k$+$O(B @code{mime-preview-condition} $BJQ?t$NCM$K$h$C(B -$B$F7h$^$j$^$9!#$b$7(B @uref{http://emacs-w3m.namazu.org/, emacs-w3m} $B$K4^$^(B -$B$l$F$$$k(B @code{mime-w3m} $B%b%8%e!<(B -$B%k(B (@pxref{SEMI MUAs, ,@acronym{SEMI} MUA $B$G(B HTML $B%a!<%k$rFI$`(B, -emacs-w3m-ja, Emacs-w3m-ja}) $B$r;H$C$F$$$k$N$J$i$P!"(B@samp{text/html} $B$N5-(B -$B;v$r:n$k$h$&$K!"<+F0E*$K(B @code{mime-preview-condition} $BJQ?t$,@_Dj$5$l$k(B -$B$G$7$g$&!#(B - @node Customizing W3 @subsection W3 $B$N%+%9%?%^%$%:(B @cindex W3 diff --git a/texi/gnus.texi b/texi/gnus.texi index d7b8928..fe5130f 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -16136,6 +16136,10 @@ the value of @code{default-file-name-coding-system}. If you are using XEmacs and want to use non-@acronym{ASCII} group names, you should set the value for the @code{nnmail-pathname-coding-system} variable properly. +The @code{nnrss} back end generates @samp{multipart/alternative} +@acronym{MIME} articles in which each contains a @samp{text/plain} part +and a @samp{text/html} part. + @cindex OPML You can also use the following commands to import and export your subscriptions from a file in @acronym{OPML} format (Outline Processor @@ -16173,6 +16177,15 @@ If you set @code{nnrss-use-local} to @code{t}, @code{nnrss} will read the feeds from local files in @code{nnrss-directory}. You can use the command @code{nnrss-generate-download-script} to generate a download script using @command{wget}. + +@item nnrss-wash-html-in-text-plain-parts +Non-@code{nil} means that @code{nnrss} renders text in @samp{text/plain} +parts as @acronym{HTML}. The function specified by the +@code{mm-text-html-renderer} variable (@pxref{Display Customization, +,Display Customization, emacs-mime, The Emacs MIME Manual}) will be used +to render text. If it is @code{nil}, which is the default, text will +simply be folded. Leave it @code{nil}, if you prefer to see +@samp{text/html} parts. @end table The following code may be helpful, if you want to show the description in @@ -16213,10 +16226,8 @@ summary buffer. (add-to-list 'nnmail-extra-headers nnrss-url-field) @end lisp -The @code{nnrss} back end generates @samp{multipart/alternative} -@acronym{MIME} articles in which each contains a @samp{text/plain} part -and a @samp{text/html} part. Even if you have added @code{"text/html"} -to the @code{mm-discouraged-alternatives} variable (@pxref{Display +Even if you have added @code{"text/html"} to the +@code{mm-discouraged-alternatives} variable (@pxref{Display Customization, ,Display Customization, emacs-mime, The Emacs MIME Manual}) since you don't want to see @acronym{HTML} parts, it might be more useful especially in @code{nnrss} groups to display