From 0f60bd529f1f4fdc1d05dee56596ef26deeebe3b Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 3 Sep 2001 00:27:13 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 30 ++++++++++++++++++++++++++++-- lisp/imap.el | 4 ++-- lisp/nnfolder.el | 3 ++- lisp/nnml.el | 50 +++++++++++++++++++++++++------------------------- lisp/nnslashdot.el | 13 +++++++------ texi/ChangeLog | 6 ++++++ texi/gnus-ja.texi | 6 ++++++ texi/gnus.texi | 6 ++++++ 8 files changed, 82 insertions(+), 36 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9f296a6..fe15f39 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,30 @@ +2001-09-02 23:12:48 Lars Magne Ingebrigtsen + + * nnslashdot.el (nnslashdot-retrieve-headers-1): Get references + right, and get all the comments. + +2001-09-02 Simon Josefsson + Suggested by Dan Christensen + + * nnfolder.el (nnfolder-request-update-info): Fix message. + + * nnml.el (nnml-request-update-info): Ditto. + +2001-09-01 Simon Josefsson + + * nnml.el (nnml-request-expire-articles): Also bind + `nnml-current-group' and `nnml-article-file-alist' when using + expiry-target. (Otherwise nnml will be in a inconsistent internal + state causing all kind of problems.) + (nnml-request-expire-articles): If `nnml-article-to-file' or + `file-attributes' failes, return article as un-expirable instead + of treating it as expired. + +2001-08-31 Sam Steingold + + * imap.el (imap-mailbox-examine, imap-mailbox-examine-1): Fix a + typo: `exmine' --> `examine'. + 2001-08-30 13:00:00 ShengHuo ZHU * nndoc.el (nndoc-forward-type-p): It is not a digest. @@ -54,8 +81,7 @@ * nnml.el (nnml-request-update-info): Fix message. (nnml-open-marks): Ditto. - * nnfolder.el (nnfolder-request-set-mark) - (nnfolder-request-update-info): Don't open group. + * nnfolder.el (nnfolder-request-update-info): (nnfolder-open-marks): Fix message. 2001-08-25 Simon Josefsson diff --git a/lisp/imap.el b/lisp/imap.el index d84aab6..c89384e 100644 --- a/lisp/imap.el +++ b/lisp/imap.el @@ -1098,11 +1098,11 @@ If EXAMINE is non-nil, do a read-only select." (defun imap-mailbox-examine-1 (mailbox &optional buffer) (with-current-buffer (or buffer (current-buffer)) - (imap-mailbox-select-1 mailbox 'exmine))) + (imap-mailbox-select-1 mailbox 'examine))) (defun imap-mailbox-examine (mailbox &optional buffer) "Examine MAILBOX on server in BUFFER." - (imap-mailbox-select mailbox 'exmine buffer)) + (imap-mailbox-select mailbox 'examine buffer)) (defun imap-mailbox-unselect (&optional buffer) "Close current folder in BUFFER, without expunging articles." diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el index 086e1e2..3f31789 100644 --- a/lisp/nnfolder.el +++ b/lisp/nnfolder.el @@ -1188,7 +1188,8 @@ This command does not work if you use short group names." (if (and (integerp (car seen)) (null (cdr seen))) (list (cons (car seen) (car seen))) - seen)))) + seen))) + (nnheader-message 8 "Updating marks for %s...done" group)) info) (defun nnfolder-group-marks-pathname (group) diff --git a/lisp/nnml.el b/lisp/nnml.el index 7a527e6..817ea15 100644 --- a/lisp/nnml.el +++ b/lisp/nnml.el @@ -315,30 +315,29 @@ This variable is a virtual server slot. See the Gnus manual for details.") (setq articles (gnus-sorted-intersection articles active-articles)) (while (and articles is-old) - (when (setq article (nnml-article-to-file (setq number (pop articles)))) - (when (setq mod-time (nth 5 (file-attributes article))) - (if (and (nnml-deletable-article-p group number) - (setq is-old - (nnmail-expired-article-p group mod-time force - nnml-inhibit-expiry))) - (progn - ;; Allow a special target group. - (unless (eq nnmail-expiry-target 'delete) - (with-temp-buffer - (nnml-request-article number group server - (current-buffer)) - (let ((nnml-current-directory nil)) - (nnmail-expiry-target-group - nnmail-expiry-target group)))) - (nnheader-message 5 "Deleting article %s in %s" - number group) - (condition-case () - (funcall nnmail-delete-file-function article) - (file-error - (push number rest))) - (setq active-articles (delq number active-articles)) - (nnml-nov-delete-article group number)) - (push number rest))))) + (if (and (setq article (nnml-article-to-file (setq number (pop articles)))) + (setq mod-time (nth 5 (file-attributes article))) + (nnml-deletable-article-p group number) + (setq is-old (nnmail-expired-article-p group mod-time force + nnml-inhibit-expiry))) + (progn + ;; Allow a special target group. + (unless (eq nnmail-expiry-target 'delete) + (with-temp-buffer + (nnml-request-article number group server (current-buffer)) + (let (nnml-current-directory + nnml-current-group + nnml-article-file-alist) + (nnmail-expiry-target-group nnmail-expiry-target group)))) + (nnheader-message 5 "Deleting article %s in %s" + number group) + (condition-case () + (funcall nnmail-delete-file-function article) + (file-error + (push number rest))) + (setq active-articles (delq number active-articles)) + (nnml-nov-delete-article group number)) + (push number rest))) (let ((active (nth 1 (assoc group nnml-group-alist)))) (when active (setcar active (or (and active-articles @@ -961,7 +960,8 @@ Use the nov database for that directory if available." (if (and (integerp (car seen)) (null (cdr seen))) (list (cons (car seen) (car seen))) - seen)))) + seen))) + (nnheader-message 8 "Updating marks for %s...done" group)) info) (defun nnml-save-marks (group server) diff --git a/lisp/nnslashdot.el b/lisp/nnslashdot.el index d8f926a..b411919 100644 --- a/lisp/nnslashdot.el +++ b/lisp/nnslashdot.el @@ -172,14 +172,15 @@ (setq date (nnslashdot-date-to-date (buffer-substring (point) (progn (skip-chars-forward "^()<>\n\r") (point))))) - (setq lines (/ (abs (- (search-forward ""))) 70)) - (forward-line 4) - (setq parent - (if (looking-at ".*cid=\\([0-9]+\\)") - (match-string 1) - nil)) + (if (not + (re-search-forward ".*cid=\\([0-9]+\\)\">Parent" nil t)) + (setq parent nil) + (setq parent (match-string 1)) + (when (string= parent "0") + (setq parent nil))) (push (cons article diff --git a/texi/ChangeLog b/texi/ChangeLog index 5c9e67f..d4a18c3 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,9 @@ +2001-09-01 Kai Gro,A_(Bjohann + + * gnus.texi (Hooking New Backends Into Gnus): Say where to put the + call for gnus-declare-backend. Add an index entry for + gnus-declare-backend. Suggested by Paul Jarc. + 2001-08-29 Simon Josefsson From Anders Jackson diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 6c17311..3f4292f 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -19550,6 +19550,9 @@ Per Abrahamsen--custom$B!"%9%3%"!"%O%$%i%$%H$H(B @sc{soup} $B%3!<%I(B ($BB> Luis Fernandes---$B%G%6%$%s$H%0%i%U%#%C%/!#(B @item +Joe Reiss---$B%9%^%$%j!<$N4i$N:ne5-$N9T$O(B @file{nnchoke.el} $B%U%!%$%k$KF~$l$^$9!#(B + $BG=NO$K$O0J2<$N$b$N$,$"$j$^$9!#(B @table @code diff --git a/texi/gnus.texi b/texi/gnus.texi index 994e8cb..7bac396 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -20041,6 +20041,9 @@ well as numerous other things). Luis Fernandes---design and graphics. @item +Joe Reiss---creator of the smiley faces. + +@item Justin Sheehy--the FAQ maintainer. @item @@ -22409,6 +22412,7 @@ Below is a slightly shortened version of the @code{nndir} backend. @subsubsection Hooking New Backends Into Gnus @vindex gnus-valid-select-methods +@findex gnus-declare-backend Having Gnus start using your new backend is rather easy---you just declare it with the @code{gnus-declare-backend} functions. This will enter the backend into the @code{gnus-valid-select-methods} variable. @@ -22422,6 +22426,8 @@ Here's an example: (gnus-declare-backend "nnchoke" 'mail 'respool 'address) @end lisp +The above line would then go in the @file{nnchoke.el} file. + The abilities can be: @table @code -- 1.7.10.4