\n") (setq body (point)) (when text - (insert text "\n") + (insert text) + (goto-char body) + ;; See `nnrss-check-group', which inserts "

". + (if (search-forward "

" nil t) + (if (eobp) + (replace-match "\n") + (replace-match "\n\n") + (let ((fill-column default-fill-column) + (window (get-buffer-window nntp-server-buffer))) + (when window + (setq fill-column + (max 1 (/ (* (window-width window) 7) 8)))) + (fill-region (point) (point-max)) + (goto-char (point-max)) + ;; XEmacs version of `fill-region' inserts newline. + (unless (bolp) + (insert "\n")))) + (goto-char (point-max)) + (insert "\n")) (when (or link enclosure) (insert "\n"))) (when link @@ -362,7 +380,11 @@ otherwise return nil." ;; FIXME: shouldn't binding `coding-system-for-read' be moved ;; to `mm-url-insert'? (let ((coding-system-for-read 'binary)) - (mm-url-insert url))) + (condition-case err + (mm-url-insert url) + (error (if (or debug-on-quit debug-on-error) + (signal (car err) (cdr err)) + (message "nnrss: Failed to fetch %s" url)))))) (nnheader-remove-cr-followed-by-lf) ;; Decode text according to the encoding attribute. (when (setq cs (nnrss-get-encoding)) @@ -497,7 +519,11 @@ nnrss: %s: Not valid XML %s and w3-parse (defun nnrss-insert-w3 (url) (mm-with-unibyte-current-buffer - (mm-url-insert url))) + (condition-case err + (mm-url-insert url) + (error (if (or debug-on-quit debug-on-error) + (signal (car err) (cdr err)) + (message "nnrss: Failed to fetch %s" url)))))) (defun nnrss-decode-entities-string (string) (if string @@ -532,7 +558,7 @@ nnrss: %s: Not valid XML %s and w3-parse ;;; Snarf functions (defun nnrss-check-group (group server) - (let (file xml subject url extra changed author date + (let (file xml subject url extra changed author date feed-subject enclosure comments rss-ns rdf-ns content-ns dc-ns) (if (and nnrss-use-local (file-exists-p (setq file (expand-file-name @@ -575,6 +601,8 @@ nnrss: %s: Not valid XML %s and w3-parse (setq extra (or extra (nnrss-node-text content-ns 'encoded item) (nnrss-node-text rss-ns 'description item))) + (if (setq feed-subject (nnrss-node-text dc-ns 'subject item)) + (setq extra (concat feed-subject "

" extra))) (setq author (or (nnrss-node-text rss-ns 'author item) (nnrss-node-text dc-ns 'creator item) (nnrss-node-text dc-ns 'contributor item))) Index: texi/ChangeLog.upstream =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/texi/ChangeLog.upstream,v retrieving revision 1.8 diff -u -p -u -r1.8 ChangeLog.upstream --- texi/ChangeLog.upstream 19 Dec 2005 13:35:32 -0000 1.8 +++ texi/ChangeLog.upstream 4 Jan 2006 07:02:59 -0000 @@ -1,3 +1,12 @@ +2005-12-22 Katsumi Yamaoka + + * gnus.texi (Summary Post Commands): Fix function bound to `S O p'. + +2005-12-19 Katsumi Yamaoka + + * emacs-mime.texi (Display Customization): Add setting example to + mm-discouraged-alternatives. + 2005-12-12 Katsumi Yamaoka * gnus.texi (MIME Commands): Mention addition of Index: texi/emacs-mime.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/texi/emacs-mime.texi,v retrieving revision 1.7 diff -u -p -u -r1.7 emacs-mime.texi --- texi/emacs-mime.texi 19 Dec 2005 13:35:32 -0000 1.7 +++ texi/emacs-mime.texi 4 Jan 2006 07:02:59 -0000 @@ -323,10 +323,28 @@ you could say something like: @end lisp Adding @code{"image/.*"} might also be useful. Spammers use it as the -prefered part of @samp{multipart/alternative} messages. See also +prefered part of @samp{multipart/alternative} messages, and you might +not notice there are other parts. See also @code{gnus-buttonized-mime-types} (@pxref{MIME Commands, ,MIME Commands, gnus, Gnus Manual}), to which adding @code{"multipart/alternative"} enables you to choose manually one of two types those mails include. +For example, you can set those variables like: + +@lisp +(setq gnus-buttonized-mime-types + '("multipart/alternative" "multipart/signed") + mm-discouraged-alternatives + '("text/html" "image/.*")) +@end lisp + +In this case, Gnus will display radio buttons for such a kind of spam +message as follows: + +@example +1. (*) multipart/alternative ( ) image/gif + +2. (*) text/plain ( ) text/html +@end example @item mm-inline-large-images @vindex mm-inline-large-images Index: texi/gnus.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/texi/gnus.texi,v retrieving revision 1.10 diff -u -p -u -r1.10 gnus.texi --- texi/gnus.texi 19 Dec 2005 13:35:32 -0000 1.10 +++ texi/gnus.texi 4 Jan 2006 07:03:09 -0000 @@ -5491,7 +5491,7 @@ default, the message is decoded and forw @cindex digests @cindex making digests Digest the current series and forward the result to a newsgroup -(@code{gnus-uu-digest-mail-forward}). This command uses the +(@code{gnus-uu-digest-post-forward}). This command uses the process/prefix convention. @item S u -- |---------------------| | I am Dyslexic of Borg. | | Fusistance is retile. Your arse will be laminated. | |---------------------------------------|