From 92cfff5cee6a062903cbeac40d29b2d9eb3cc0d3 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Sun, 13 Apr 2003 13:34:07 +0000 Subject: [PATCH] Synch to Oort Gnus 200304131128. --- lisp/ChangeLog | 29 +++++++++++++++++++++++++++++ lisp/gnus-agent.el | 4 +++- lisp/gnus-cache.el | 11 +++++++++++ lisp/gnus-srvr.el | 9 ++++----- lisp/gnus-sum.el | 2 +- lisp/gnus.el | 12 ++++++++---- lisp/nnmbox.el | 2 +- 7 files changed, 57 insertions(+), 12 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ca8c2b0..00b39bb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,32 @@ +2003-04-13 Jesper Harder + + * gnus-sum.el (gnus-summary-local-variables): Use defvar since + we're let-binding it. + + * nnmbox.el (nnmbox-mbox-buffer): It's not a constant. + +2003-04-13 Lars Magne Ingebrigtsen + + * gnus.el (gnus-group-prefixed-name): Comment out the test for + colon. + + * gnus-srvr.el (gnus-browse-read-group): Don't give the real name + to the ephemeral entry, but the prefixed name. + + * gnus.el (gnus-group-prefixed-name): Clean up. + +2003-04-13 Kevin Greiner + + * gnus-agent.el (gnus-agent-group-pathname): Bind + gnus-command-method so that gnus-agent-directory will always + return a valid directory. + * gnus-cache.el (gnus-cache-enter-article): Remove article from + gnus-newsgroup-undownloaded so that the summary will display the + article as downloaded. + (gnus-cache-remove-article): If the article isn't in the agent, + remove it from gnus-newsgroup-undownloaded so that the summary + will display the article as undownloaded. + 2003-04-13 Lars Magne Ingebrigtsen * gnus.el (gnus-version-number): Bump. diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index fca87dd..c884cd1 100644 --- a/lisp/gnus-agent.el +++ b/lisp/gnus-agent.el @@ -1173,7 +1173,9 @@ This can be added to `gnus-select-article-hook' or ;; nnagent uses nnmail-group-pathname to read articles while ;; unplugged. The agent must, therefore, use the same directory ;; while plugged. - (nnmail-group-pathname (gnus-group-real-name group) (gnus-agent-directory))) + (let ((gnus-command-method (or gnus-command-method + (gnus-find-method-for-group group)))) + (nnmail-group-pathname (gnus-group-real-name group) (gnus-agent-directory)))) (defun gnus-agent-get-function (method) (if (gnus-online method) diff --git a/lisp/gnus-cache.el b/lisp/gnus-cache.el index e9733a2..8fc0e93 100644 --- a/lisp/gnus-cache.el +++ b/lisp/gnus-cache.el @@ -36,6 +36,8 @@ (require 'gnus-range) (require 'gnus-start) (eval-when-compile + (if (not (fboundp 'gnus-agent-load-alist)) + (defun gnus-agent-load-alist (group))) (require 'gnus-sum)) (defcustom gnus-cache-active-file @@ -336,8 +338,10 @@ Returns the list of articles entered." gnus-newsgroup-name article (gnus-summary-article-header article) nil nil nil t) + (setq gnus-newsgroup-undownloaded (delq article gnus-newsgroup-undownloaded)) (push article out)) (gnus-message 2 "Can't cache article %d" article)) + (gnus-summary-update-download-mark article) (gnus-summary-update-secondary-mark article)) (gnus-summary-next-subject 1) (gnus-summary-position-point) @@ -355,7 +359,14 @@ Returns the list of articles removed." (setq article (pop articles)) (gnus-summary-remove-process-mark article) (when (gnus-cache-possibly-remove-article article nil nil nil t) + (when gnus-newsgroup-agentized + (let ((alist (gnus-agent-load-alist gnus-newsgroup-name))) + (unless (cdr (assoc article alist)) + (setq gnus-newsgroup-undownloaded + (gnus-add-to-sorted-list + gnus-newsgroup-undownloaded article))))) (push article out)) + (gnus-summary-update-download-mark article) (gnus-summary-update-secondary-mark article)) (gnus-summary-next-subject 1) (gnus-summary-position-point) diff --git a/lisp/gnus-srvr.el b/lisp/gnus-srvr.el index 796abbd..5f846a0 100644 --- a/lisp/gnus-srvr.el +++ b/lisp/gnus-srvr.el @@ -831,7 +831,7 @@ buffer. (if (or (not (gnus-get-info group)) (gnus-ephemeral-group-p group)) (unless (gnus-group-read-ephemeral-group - (gnus-group-real-name group) gnus-browse-current-method nil + group gnus-browse-current-method nil (cons (current-buffer) 'browse)) (error "Couldn't enter %s" group)) (unless (gnus-group-read-group nil no-article group) @@ -876,10 +876,9 @@ buffer. (beginning-of-line) (let ((name (get-text-property (point) 'gnus-group))) (when (re-search-forward ": \\(.*\\)$" (gnus-point-at-eol) t) - (gnus-group-prefixed-name - (or name - (match-string-no-properties 1)) - gnus-browse-current-method))))) + (concat (gnus-method-to-server-name gnus-browse-current-method) ":" + (or name + (match-string-no-properties 1))))))) (defun gnus-browse-describe-group (group) "Describe the current group." diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 6624e04..f2bb80a 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -1382,7 +1382,7 @@ This list will always be a subset of gnus-newsgroup-undownloaded.") (defvar gnus-article-before-search nil) -(defconst gnus-summary-local-variables +(defvar gnus-summary-local-variables '(gnus-newsgroup-name gnus-newsgroup-begin gnus-newsgroup-end gnus-newsgroup-last-rmail gnus-newsgroup-last-mail diff --git a/lisp/gnus.el b/lisp/gnus.el index af67aca..f58376e 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -3264,12 +3264,16 @@ that that variable is buffer-local to the summary buffers." (format "%s+%s" (car method) (nth 1 method))) (defun gnus-group-prefixed-name (group method &optional full) - "Return the whole name from GROUP and METHOD. Call with full set to -get the fully qualified group name (even if the server is native)." - (and (stringp method) (setq method (gnus-server-to-method method))) + "Return the whole name from GROUP and METHOD. +Call with full set to get the fully qualified group name (even if the +server is native)." + (when (stringp method) + (setq method (gnus-server-to-method method))) (if (or (not method) (and (not full) (gnus-server-equal method "native")) - (string-match ":" group)) + ;;;!!! This might not be right. We'll see... + ;(string-match ":" group) + ) group (concat (gnus-method-to-server-name method) ":" group))) diff --git a/lisp/nnmbox.el b/lisp/nnmbox.el index 3cb586f..1d39aae 100644 --- a/lisp/nnmbox.el +++ b/lisp/nnmbox.el @@ -57,7 +57,7 @@ (defvoo nnmbox-current-group nil "Current nnmbox news group directory.") -(defconst nnmbox-mbox-buffer nil) +(defvar nnmbox-mbox-buffer nil) (defvoo nnmbox-status-string "") -- 1.7.10.4