From ba0226ddfab8a17b926c3c6959775e3cc5207a74 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Tue, 28 Feb 2006 00:38:35 +0000 Subject: [PATCH] Revision: emacs@sv.gnu.org/emacs--devo--0--patch-126 Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 40-42) - Merge from emacs--devo--0 - Update from CVS --- etc/gnus-tut.txt | 2 +- lisp/gnus/ChangeLog | 32 +++++++++++++++++++++----------- lisp/gnus/flow-fill.el | 2 +- lisp/gnus/gnus-sum.el | 10 ++++++---- man/ChangeLog | 5 +++++ man/emacs-mime.texi | 6 +++++- 6 files changed, 39 insertions(+), 18 deletions(-) diff --git a/etc/gnus-tut.txt b/etc/gnus-tut.txt index 5dd26f1dfc5..43a1f647488 100644 --- a/etc/gnus-tut.txt +++ b/etc/gnus-tut.txt @@ -223,7 +223,7 @@ want this is beyond me, but here goes: Create the group by saying -`M-a my.virtual.newsgroupnnvirtual^rec\.aquaria\.*' +`G m my.virtual.newsgroupnnvirtual^rec\.aquaria\.*' This will create the group "nnvirtual:my.virtual.newsgroup", which will collect all articles from all the groups in the "rec.aquaria" diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 87327dde482..003504b2f12 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,13 @@ +2006-02-27 Reiner Steib + + * gnus-sum.el (gnus-sequence-of-unread-articles): Return nil if + first or last are nil. + +2006-02-24 Simon Josefsson + + * flow-fill.el (fill-flowed): Flow-fill unquoted lines too. + Merge of 2005-10-26 change from the trunk. + 2006-02-23 Lars Magne Ingebrigtsen * flow-fill.el (fill-flowed): Bind adaptive-fill-mode to nil. @@ -863,10 +873,9 @@ * pgg-parse.el (top-level): Don't require custom, it is autoloaded. (To sync with No Gnus.) -2005-05-09 Simon Josefsson +2005-05-09 Georg C. F. Greve (tiny change) - * pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Fix PIN caching, - tiny patch from "Georg C. F. Greve" . + * pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Fix PIN caching. 2005-10-08 Simon Josefsson @@ -2571,11 +2580,13 @@ * deuglify.el (gnus-outlook-deuglify): Add :version. - * html2text.el: Beautify code. Improve doc strings. Some checkdoc - cleanup. + * html2text.el: Beautify code. Improve doc strings. Some + checkdoc cleanup. (html2text-get-attr, html2text-fix-paragraph): Simplify code. - (html2text-format-tag-list): Add "strong" and "em". - From "Alfred M. Szmidt" (tiny change). + +2004-11-01 Alfred M. Szmidt (tiny change) + + * html2text.el (html2text-format-tag-list): Add "strong" and "em". 2004-10-29 Katsumi Yamaoka @@ -3436,14 +3447,13 @@ Check `starttls-use-gnutls' and pass on to corresponding *-gnutls function if it is set. -2004-08-31 Simon Josefsson +2004-08-30 Andreas Schwab * rfc2231.el (rfc2231-parse-string): Restore whitespace syntax for - ?* and ?\; (tiny patch). From Andreas Schwab . + ?* and ?\;. * ietf-drums.el (ietf-drums-syntax-table): Set syntax of ?* ?\; - and ?\' to symbol instead of whitespace (tiny patch). - From Andreas Schwab . + and ?\' to symbol instead of whitespace. 2004-08-31 Jesper Harder diff --git a/lisp/gnus/flow-fill.el b/lisp/gnus/flow-fill.el index 480505549c9..98697439106 100644 --- a/lisp/gnus/flow-fill.el +++ b/lisp/gnus/flow-fill.el @@ -121,7 +121,7 @@ RFC 2646 suggests 66 characters for readability." (while (re-search-forward " $" nil t) (when (save-excursion (beginning-of-line) - (looking-at "^\\(>+\\)\\( ?\\)")) + (looking-at "^\\(>*\\)\\( ?\\)")) (let ((quote (match-string 1)) sig) (if (string= quote "") diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index b2a70b8fcb6..70dabcd525b 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -6452,10 +6452,12 @@ displayed, no centering will be performed." (setq nlast (if (atom (cadr read)) (cadr read) (caadr read))) (setq read (cdr read))))) ;; And add the last unread articles. - (cond ((< first last) - (push (cons first last) unread)) - ((= first last) - (push first unread))) + (cond ((not (and first last)) + nil) + ((< first last) + (push (cons first last) unread)) + ((= first last) + (push first unread))) ;; Return the sequence of unread articles. (delq 0 (nreverse unread)))) diff --git a/man/ChangeLog b/man/ChangeLog index e7e2f620263..af06758f6e0 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,8 @@ +2006-02-27 Simon Josefsson + + * emacs-mime.texi (Flowed text): Add mm-fill-flowed. (Sync + 2004-01-27 from the trunk). + 2006-02-24 Alan Mackenzie * cc-mode.texi: Rename c-hungry-backspace to diff --git a/man/emacs-mime.texi b/man/emacs-mime.texi index 3e9f2b5f283..69c1c21b5aa 100644 --- a/man/emacs-mime.texi +++ b/man/emacs-mime.texi @@ -983,7 +983,11 @@ together and wrapped after the column decided by @code{fill-flowed-display-column}. The default is to wrap after @code{fill-column}. - +@table @code +@item mm-fill-flowed +@vindex mm-fill-flowed +If non-@code{nil} a format=flowed article will be displayed flowed. +@end table @node Interface Functions -- 2.39.2