From: yamaoka Date: Sun, 20 Oct 2002 23:32:29 +0000 (+0000) Subject: Synch with Oort Gnus. X-Git-Tag: t-gnus-6_15_8-05-quimby~20 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=db60c413560d63b79a5f46330c8367175bb1c7c9;p=elisp%2Fgnus.git- Synch with Oort Gnus. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e1de796..22186a5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,27 @@ +2002-10-19 TSUCHIYA Masatoshi + + * nnheader.el (nnheader-remove-body): Fix an error of detecting + boundary between headers and body. + * nnml.el (nnml-parse-head): Ditto. + +2002-10-20 Lars Magne Ingebrigtsen + + * nnslashdot.el (nnslashdot-generate-active): Ignore any bogus + entries. + + * gnus-group.el (gnus-fetch-group): Allow an optional + specification of the articles to select. + + * gnus-srvr.el (gnus-server-prepare): Removed superfluous cdr. + +2002-10-20 Kai Gro,A_(Bjohann + + * gnus-agent.el (gnus-agent-fetch-group-1): After fetching + headers from the group, update variable `articles' to contain + only those numbers where headers exist. (When fetching all + articles in a group, Gnus creates lots of numbers where there is + no articles.) + 2002-10-20 Steve Youngs * pgg-parse.el (pgg-parse-public-key-algorithm-alist): XEmacs @@ -20,7 +44,7 @@ 2002-10-18 Kai Gro,A_(Bjohann - * gnus-spec.el (gnus-make-format-preserve-properties) + * gnus-spec.el (gnus-make-format-preserve-properties) (gnus-xmas-format, gnus-parse-simple-format): Preserve text properties also on XEmacs. `gnus-xmas-format' is like format but preserves text properties on XEmacs (though it only understands @@ -63,7 +87,7 @@ (spam-display-buffer-contents): Remove. (spam-bogofilter-score): Merge spam-display-buffer-contents. -2002-10-17 Ted Zlatanov +2002-10-17 Ted Zlatanov * spam.el (spam-display-buffer-contents): New function. (spam-bogofilter-score): use spam-display-buffer-contents, patch diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index 6f0e90e..19ee85b 100644 --- a/lisp/gnus-agent.el +++ b/lisp/gnus-agent.el @@ -1332,6 +1332,11 @@ This can be added to `gnus-select-article-hook' or (setq gnus-newsgroup-headers (gnus-get-newsgroup-headers-xover articles nil nil group)) + ;; Some articles may not exist, so update `articles' + ;; from what was actually found. -- kai + (setq articles + (mapcar (lambda (x) (aref x 0)) + gnus-newsgroup-headers)) ;; `gnus-agent-overview-buffer' may be killed for ;; timeout reason. If so, recreate it. (gnus-agent-create-buffer))) diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el index 5368953..7c1916e 100644 --- a/lisp/gnus-group.el +++ b/lisp/gnus-group.el @@ -1902,14 +1902,14 @@ be permanent." (gnus-group-prefixed-name group method) method))) ;;;###autoload -(defun gnus-fetch-group (group) +(defun gnus-fetch-group (group &optional articles) "Start Gnus if necessary and enter GROUP. Returns whether the fetching was successful or not." (interactive (list (gnus-group-completing-read-group-name "Group name: " gnus-active-hashtb))) (unless (get-buffer gnus-group-buffer) (gnus-no-server)) - (gnus-group-read-group nil nil group)) + (gnus-group-read-group articles nil group)) ;;;###autoload (defun gnus-fetch-group-other-frame (group) diff --git a/lisp/gnus-srvr.el b/lisp/gnus-srvr.el index 2b6373f..d2b6022 100644 --- a/lisp/gnus-srvr.el +++ b/lisp/gnus-srvr.el @@ -321,7 +321,7 @@ The following commands are available: (while alist (unless (member (cdar alist) done) (push (cdar alist) done) - (cdr (setq server (pop alist))) + (setq server (pop alist)) (when (and server (car server) (cdr server)) (gnus-server-insert-server-line (car server) (cdr server)))) (when (member (cdar alist) done) diff --git a/lisp/nnheader.el b/lisp/nnheader.el index e163cdb..2cc8757 100644 --- a/lisp/nnheader.el +++ b/lisp/nnheader.el @@ -1209,8 +1209,7 @@ list of headers that match SEQUENCE (see `nntp-retrieve-headers')." (defun nnheader-remove-body () "Remove the body from an article in this current buffer." (goto-char (point-min)) - (when (or (search-forward "\n\n" nil t) - (search-forward "\n\r\n" nil t)) + (when (re-search-forward "\n\r?\n" nil t) (delete-region (point) (point-max)))) (defun nnheader-set-temp-buffer (name &optional noerase) diff --git a/lisp/nnml.el b/lisp/nnml.el index ac65283..60595dd 100644 --- a/lisp/nnml.el +++ b/lisp/nnml.el @@ -708,11 +708,9 @@ marks file will be regenerated properly by Gnus.") (unless (zerop (buffer-size)) (narrow-to-region (goto-char (point-min)) - (if (search-forward "\n\n" nil t) + (if (re-search-forward "\n\r?\n" nil t) (1- (point)) - (if (search-forward "\n\r\n" nil t) - (- (point) 2) - (point-max))))) + (point-max)))) (let ((headers (nnheader-parse-naked-head))) (mail-header-set-chars headers chars) (mail-header-set-number headers number) diff --git a/lisp/nnslashdot.el b/lisp/nnslashdot.el index 45299f5..7b38b7c 100644 --- a/lisp/nnslashdot.el +++ b/lisp/nnslashdot.el @@ -500,8 +500,9 @@ (set-buffer nntp-server-buffer) (erase-buffer) (dolist (elem nnslashdot-groups) - (insert (prin1-to-string (car elem)) - " " (number-to-string (cadr elem)) " 1 y\n")))) + (when (numberp (cadr elem)) + (insert (prin1-to-string (car elem)) + " " (number-to-string (cadr elem)) " 1 y\n"))))) (defun nnslashdot-lose (why) (error "Slashdot HTML has changed; please get a new version of nnslashdot"))