User: youngs
Date: 06/01/04 08:05:38
Modified: packages/xemacs-packages/gnus/texi ChangeLog.upstream
emacs-mime.texi gnus.texi
Log:
2006-01-04 Steve Youngs <steve(a)sxemacs.org>
* Sync with upstream stable branch.
Please see the ChangeLog.upstream files for details.
Revision Changes Path
1.98 +5 -0 XEmacs/packages/xemacs-packages/gnus/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/ChangeLog,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- ChangeLog 2005/12/19 14:21:56 1.97
+++ ChangeLog 2006/01/04 07:05:25 1.98
＠＠ -1,3 +1,8 ＠＠
+2006-01-04 Steve Youngs <steve(a)sxemacs.org>
+
+ * Sync with upstream stable branch.
+ Please see the ChangeLog.upstream files for details.
+
2005-12-19 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.88 released.
1.9 +41 -0 XEmacs/packages/xemacs-packages/gnus/lisp/ChangeLog.upstream
Index: ChangeLog.upstream
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/ChangeLog.upstream,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ChangeLog.upstream 2005/12/19 13:35:24 1.8
+++ ChangeLog.upstream 2006/01/04 07:05:29 1.9
＠＠ -1,3 +1,44 ＠＠
+2006-01-03 Steve Youngs <steve(a)sxemacs.org>
+
+ * gnus-xmas.el (gnus-xmas-group-startup-message): Typo
+ gnus-splash-face -> gnus-splash. Fixes starting from a TTY in
+ XEmacs.
+ From Rodrigo Ventura <yoda(a)isr.ist.utl.pt>
+
+2006-01-01 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * gnus-sum.el (gnus-summary-work-articles): Remove useless `min'.
+
+ * nnrss.el (nnrss-fetch): Make it fail gracefully when it can't
+ fetch a feed. Suggested by Mark Plaksin <happy(a)mcplaksin.org>.
+ (nnrss-insert-w3): Ditto.
+
+2005-12-21 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * nnrss.el (nnrss-request-article): Fix last change; fill
+ text/plain parts.
+
+2005-12-20 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * nnrss.el (nnrss-request-article): Replace <br />s with newlines
+ in text/plain part.
+ (nnrss-check-group): Don't add excessive newline to dc:subject.
+
+2005-12-19 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * gnus-art.el (gnus-article-delete-text-of-type): Enable it to
+ remove MIME buttons associated with multipart/alternative parts.
+ (gnus-mime-display-alternative): Tag buttons using `article-type'
+ text property.
+
+ * gnus-msg.el (gnus-copy-article-buffer): Remove MIME buttons
+ associated with multipart/alternative parts.
+
+2005-12-19 Mark Plaksin <happy(a)mcplaksin.org> (tiny change)
+
+ * nnrss.el (nnrss-check-group): Put the RSS dc:subject in the
+ article.
+
2005-12-18 Lars Magne Ingebrigtsen <larsi(a)gnus.org>
* dns.el (query-dns): Make sure we check the buffer size before
1.9 +19 -5 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-art.el
Index: gnus-art.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-art.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gnus-art.el 2005/12/19 13:35:24 1.8
+++ gnus-art.el 2006/01/04 07:05:29 1.9
＠＠ -1632,10 +1632,24 ＠＠ Initialized from `text-mode-syntax-table
"Delete text of TYPE in the current buffer."
(save-excursion
(let ((b (point-min)))
- (while (setq b (text-property-any b (point-max) 'article-type type))
- (delete-region
- b (or (text-property-not-all b (point-max) 'article-type type)
- (point-max)))))))
+ (if (eq type 'multipart)
+ ;; Remove MIME buttons associated with multipart/alternative parts.
+ (progn
+ (goto-char b)
+ (while (if (get-text-property (point) 'gnus-part)
+ (setq b (point))
+ (when (setq b (next-single-property-change (point)
+ 'gnus-part))
+ (goto-char b)
+ t))
+ (end-of-line)
+ (skip-chars-forward "\n")
+ (when (eq (get-text-property b 'article-type) 'multipart)
+ (delete-region b (point)))))
+ (while (setq b (text-property-any b (point-max) 'article-type type))
+ (delete-region
+ b (or (text-property-not-all b (point-max) 'article-type type)
+ (point-max))))))))
(defun gnus-article-delete-invisible-text ()
"Delete all invisible text in the current buffer."
＠＠ -4956,7 +4970,7 ＠＠ If displaying \"text/html\" is discourag
,gnus-mouse-face-prop ,gnus-article-mouse-face
face ,gnus-article-button-face
gnus-part ,id
- gnus-data ,handle))
+ article-type multipart))
(widget-convert-button 'link from (point)
:action 'gnus-widget-press-button
:button-keymap gnus-widget-button-keymap)
1.8 +1 -0 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-msg.el
Index: gnus-msg.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-msg.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gnus-msg.el 2005/11/15 03:45:47 1.7
+++ gnus-msg.el 2006/01/04 07:05:29 1.8
＠＠ -844,6 +844,7 ＠＠ header line with the old Message-ID."
(delete-region (point) (point-max))
(insert yank-string))
(gnus-article-delete-text-of-type 'annotation)
+ (gnus-article-delete-text-of-type 'multipart)
(gnus-remove-text-with-property 'gnus-prev)
(gnus-remove-text-with-property 'gnus-next)
(gnus-remove-text-with-property 'gnus-decoration)
1.9 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-sum.el
Index: gnus-sum.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-sum.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gnus-sum.el 2005/11/15 03:45:49 1.8
+++ gnus-sum.el 2006/01/04 07:05:29 1.9
＠＠ -6114,7 +6114,7 ＠＠ current article will be taken into consi
(let ((max (max (point) (mark)))
articles article)
(save-excursion
- (goto-char (min (min (point) (mark))))
+ (goto-char (min (point) (mark)))
(while
(and
(push (setq article (gnus-summary-article-number)) articles)
1.9 +1 -1 XEmacs/packages/xemacs-packages/gnus/lisp/gnus-xmas.el
Index: gnus-xmas.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-xmas.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gnus-xmas.el 2005/12/19 13:35:25 1.8
+++ gnus-xmas.el 2006/01/04 07:05:30 1.9
＠＠ -541,7 +541,7 ＠＠ call it with the value of the `gnus-data
(rest (- wheight pheight)))
(insert (make-string (max 0 (* 2 (/ rest 3))) ?\n)))
;; Paint it.
- (put-text-property (point-min) (point-max) 'face 'gnus-splash-face)))
+ (put-text-property (point-min) (point-max) 'face 'gnus-splash)))
(setq modeline-buffer-identification
(list (concat gnus-version ": *Group*")))
(set-buffer-modified-p t))
1.7 +32 -4 XEmacs/packages/xemacs-packages/gnus/lisp/nnrss.el
Index: nnrss.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nnrss.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- nnrss.el 2005/11/15 03:45:58 1.6
+++ nnrss.el 2006/01/04 07:05:30 1.7
＠＠ -212,7 +212,25 ＠＠ for decoding when the cdr that the data
"<#part type=\"text/plain\">\n")
(setq body (point))
(when text
- (insert text "\n")
+ (insert text)
+ (goto-char body)
+ ;; See `nnrss-check-group', which inserts "<br /><br />".
+ (if (search-forward "<br /><br />" 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 "<br /><br />" 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)))
1.9 +9 -0 XEmacs/packages/xemacs-packages/gnus/texi/ChangeLog.upstream
Index: ChangeLog.upstream
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/texi/ChangeLog.upstream,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ChangeLog.upstream 2005/12/19 13:35:32 1.8
+++ ChangeLog.upstream 2006/01/04 07:05:34 1.9
＠＠ -1,3 +1,12 ＠＠
+2005-12-22 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * gnus.texi (Summary Post Commands): Fix function bound to `S O p'.
+
+2005-12-19 Katsumi Yamaoka <yamaoka(a)jpl.org>
+
+ * emacs-mime.texi (Display Customization): Add setting example to
+ mm-discouraged-alternatives.
+
2005-12-12 Katsumi Yamaoka <yamaoka(a)jpl.org>
* gnus.texi (MIME Commands): Mention addition of
1.8 +19 -1 XEmacs/packages/xemacs-packages/gnus/texi/emacs-mime.texi
Index: emacs-mime.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/texi/emacs-mime.texi,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- emacs-mime.texi 2005/12/19 13:35:32 1.7
+++ emacs-mime.texi 2006/01/04 07:05:35 1.8
＠＠ -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
1.11 +1 -1 XEmacs/packages/xemacs-packages/gnus/texi/gnus.texi
Index: gnus.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/texi/gnus.texi,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- gnus.texi 2005/12/19 13:35:32 1.10
+++ gnus.texi 2006/01/04 07:05:35 1.11
＠＠ -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
