APPROVE COMMIT
Norbert, this should be OK to go.
NOTE: This patch has been committed.
gnus patch:
ChangeLog files diff command: cvs -q diff -U 0
Files affected: ChangeLog
Source files diff command: cvs -q diff -uN
Files affected: texi/gnus.texi texi/emacs-mime.texi texi/ChangeLog.upstream lisp/nnrss.el lisp/gnus-xmas.el lisp/gnus-sum.el lisp/gnus-msg.el lisp/gnus-art.el lisp/ChangeLog.upstream
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/ChangeLog,v
retrieving revision 1.97
diff -u -p -U0 -r1.97 ChangeLog
--- ChangeLog 19 Dec 2005 14:21:56 -0000 1.97
+++ ChangeLog 4 Jan 2006 07:03:19 -0000
@@ -0,0 +1,5 @@
+2006-01-04 Steve Youngs <steve(a)sxemacs.org>
+
+ * Sync with upstream stable branch.
+ Please see the ChangeLog.upstream files for details.
+
Index: lisp/ChangeLog.upstream
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/ChangeLog.upstream,v
retrieving revision 1.8
diff -u -p -u -r1.8 ChangeLog.upstream
--- lisp/ChangeLog.upstream 19 Dec 2005 13:35:24 -0000 1.8
+++ lisp/ChangeLog.upstream 4 Jan 2006 07:02:11 -0000
@@ -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
Index: lisp/gnus-art.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-art.el,v
retrieving revision 1.8
diff -u -p -u -r1.8 gnus-art.el
--- lisp/gnus-art.el 19 Dec 2005 13:35:24 -0000 1.8
+++ lisp/gnus-art.el 4 Jan 2006 07:02:54 -0000
@@ -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)
Index: lisp/gnus-msg.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-msg.el,v
retrieving revision 1.7
diff -u -p -u -r1.7 gnus-msg.el
--- lisp/gnus-msg.el 15 Nov 2005 03:45:47 -0000 1.7
+++ lisp/gnus-msg.el 4 Jan 2006 07:02:55 -0000
@@ -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)
Index: lisp/gnus-sum.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-sum.el,v
retrieving revision 1.8
diff -u -p -u -r1.8 gnus-sum.el
--- lisp/gnus-sum.el 15 Nov 2005 03:45:49 -0000 1.8
+++ lisp/gnus-sum.el 4 Jan 2006 07:02:58 -0000
@@ -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)
Index: lisp/gnus-xmas.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/gnus-xmas.el,v
retrieving revision 1.8
diff -u -p -u -r1.8 gnus-xmas.el
--- lisp/gnus-xmas.el 19 Dec 2005 13:35:25 -0000 1.8
+++ lisp/gnus-xmas.el 4 Jan 2006 07:02:58 -0000
@@ -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))
Index: lisp/nnrss.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nnrss.el,v
retrieving revision 1.6
diff -u -p -u -r1.6 nnrss.el
--- lisp/nnrss.el 15 Nov 2005 03:45:58 -0000 1.6
+++ lisp/nnrss.el 4 Jan 2006 07:02:58 -0000
@@ -212,7 +212,25 @@ for decoding when the cdr that the data
"