X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fgnus-sum.el;h=6ffc5d9e821e669b1391bbb865dd086366a3cd0e;hp=c01f91973a0fd6b64f1a5e95281904dc5130aed9;hb=cc4fc0c3aad0be9553b18e499ceb2218a21051e0;hpb=b681463f0f43579c4836496669ed9c3f4d34969a diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index c01f91973..6ffc5d9e8 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -1499,9 +1499,6 @@ the type of the variable (string, integer, character, etc).") (defvar gnus-newsgroup-forwarded nil "List of articles that have been forwarded in the current newsgroup.") -(defvar gnus-newsgroup-recent nil - "List of articles that have are recent in the current newsgroup.") - (defvar gnus-newsgroup-expirable nil "Sorted list of articles in the current newsgroup that can be expired.") @@ -1578,7 +1575,6 @@ This list will always be a subset of gnus-newsgroup-undownloaded.") gnus-newsgroup-saved gnus-newsgroup-replied gnus-newsgroup-forwarded - gnus-newsgroup-recent gnus-newsgroup-expirable gnus-newsgroup-killed gnus-newsgroup-unseen @@ -3743,8 +3739,6 @@ buffer that was in action when the last article was fetched." gnus-forwarded-mark) ((memq gnus-tmp-current gnus-newsgroup-saved) gnus-saved-mark) - ((memq gnus-tmp-number gnus-newsgroup-recent) - gnus-recent-mark) ((memq gnus-tmp-number gnus-newsgroup-unseen) gnus-unseen-mark) (t gnus-no-mark))) @@ -3967,7 +3961,7 @@ If NO-DISPLAY, don't generate a summary buffer." ;; (when (and (not (gnus-group-native-p group)) ;; (not (gnus-gethash group gnus-newsrc-hashtb))) ;; (error "Dead non-native groups can't be entered")) - (gnus-message 5 "Retrieving newsgroup: %s..." + (gnus-message 7 "Retrieving newsgroup: %s..." (gnus-group-decoded-name group)) (let* ((new-group (gnus-summary-setup-buffer group)) (quit-config (gnus-group-quit-config group)) @@ -4733,7 +4727,7 @@ If LINE, insert the rebuilt thread starting on line LINE." (car headers)))) (defun gnus-parent-headers (in-headers &optional generation) - "Return the headers of the GENERATIONeth parent of HEADERS." + "Return the headers of the GENERATIONth parent of HEADERS." (unless generation (setq generation 1)) (let ((parent t) @@ -5395,8 +5389,6 @@ or a straight list of headers." gnus-forwarded-mark) ((memq number gnus-newsgroup-saved) gnus-saved-mark) - ((memq number gnus-newsgroup-recent) - gnus-recent-mark) ((memq number gnus-newsgroup-unseen) gnus-unseen-mark) (t gnus-no-mark)) @@ -5551,7 +5543,7 @@ or a straight list of headers." (defun gnus-fetch-headers (articles &optional limit force-new dependencies) "Fetch headers of ARTICLES." (let ((name (gnus-group-decoded-name gnus-newsgroup-name))) - (gnus-message 5 "Fetching headers for %s..." name) + (gnus-message 7 "Fetching headers for %s..." name) (prog1 (if (eq 'nov (setq gnus-headers-retrieved-by @@ -5568,7 +5560,7 @@ or a straight list of headers." (gnus-get-newsgroup-headers-xover articles force-new dependencies gnus-newsgroup-name t) (gnus-get-newsgroup-headers dependencies force-new)) - (gnus-message 5 "Fetching headers for %s...done" name)))) + (gnus-message 7 "Fetching headers for %s...done" name)))) (defun gnus-select-newsgroup (group &optional read-all select-articles) "Select newsgroup GROUP. @@ -5807,8 +5799,6 @@ If SELECT-ARTICLES, only select those articles from GROUP." (memq article gnus-newsgroup-forwarded)) ((eq type 'seen) (not (memq article gnus-newsgroup-unseen))) - ((eq type 'recent) - (memq article gnus-newsgroup-recent)) (t t)))) (defun gnus-articles-to-read (group &optional read-all) @@ -5869,15 +5859,15 @@ If SELECT-ARTICLES, only select those articles from GROUP." (read-string (if only-read-p (format - "How many articles from %s (available %d, default %d): " - (gnus-group-decoded-name - (gnus-group-real-name gnus-newsgroup-name)) - number default) - (format - "How many articles from %s (%d available): " + "How many articles from %s (available %d, default %d): " (gnus-group-decoded-name (gnus-group-real-name gnus-newsgroup-name)) - default)) + number default) + (format + "How many articles from %s (%d default): " + (gnus-group-decoded-name + (gnus-group-real-name gnus-newsgroup-name)) + default)) nil nil (number-to-string default)))) @@ -7214,6 +7204,7 @@ If FORCE (the prefix), also save the .newsrc file(s)." (quit-config (gnus-group-quit-config gnus-newsgroup-name)) (gnus-group-is-exiting-p t) (article-buffer gnus-article-buffer) + (original-article-buffer gnus-original-article-buffer) (mode major-mode) (group-point nil) (buf (current-buffer)) @@ -7290,7 +7281,7 @@ If FORCE (the prefix), also save the .newsrc file(s)." (unless (eq major-mode 'gnus-sticky-article-mode) (gnus-kill-buffer article-buffer) (setq gnus-article-current nil)))) - (gnus-kill-buffer gnus-original-article-buffer)) + (gnus-kill-buffer original-article-buffer)) ;; Clear the current group name. (unless quit-config @@ -8630,6 +8621,8 @@ fetched for this group." 'list gnus-newsgroup-headers (gnus-fetch-headers articles nil t) 'gnus-article-sort-by-number)) + (setq gnus-newsgroup-articles + (gnus-sorted-nunion gnus-newsgroup-articles articles)) (gnus-summary-limit (append articles gnus-newsgroup-limit)))) (defun gnus-summary-limit-exclude-dormant () @@ -9022,9 +9015,11 @@ non-numeric or nil fetch the number specified by the (keep-lines (regexp-opt ',(append refs (list id subject))))))) (gnus-fetch-headers (list last) (if (numberp limit) - (* 2 limit) limit) t))))) + (* 2 limit) limit) t)))) + article-ids) (when (listp new-headers) (dolist (header new-headers) + (push (mail-header-number header) article-ids) (when (member (mail-header-number header) gnus-newsgroup-unselected) (push (mail-header-number header) gnus-newsgroup-unreads) (setq gnus-newsgroup-unselected @@ -9035,6 +9030,8 @@ non-numeric or nil fetch the number specified by the (gnus-merge 'list gnus-newsgroup-headers new-headers 'gnus-article-sort-by-number))) + (setq gnus-newsgroup-articles + (gnus-sorted-nunion gnus-newsgroup-articles (nreverse article-ids))) (gnus-summary-limit-include-thread id)))) (defun gnus-summary-refer-article (message-id) @@ -9614,8 +9611,10 @@ C-u g', show the raw article." (when (gnus-summary-goto-subject (cdr gnus-article-current) nil t) (gnus-summary-update-secondary-mark (cdr gnus-article-current)))))) ((not arg) - ;; Select the article the normal way. - (gnus-summary-select-article nil 'force)) + (require 'shr) + (let ((shr-ignore-cache t)) + ;; Select the article the normal way. + (gnus-summary-select-article nil 'force))) ((equal arg '(16)) ;; C-u C-u g (let ((gnus-inhibit-article-treatments t)) @@ -10978,8 +10977,6 @@ If NO-EXPIRE, auto-expiry will be inhibited." gnus-forwarded-mark) ((memq article gnus-newsgroup-saved) gnus-saved-mark) - ((memq article gnus-newsgroup-recent) - gnus-recent-mark) ((memq article gnus-newsgroup-unseen) gnus-unseen-mark) (t gnus-no-mark)) @@ -12587,12 +12584,16 @@ UNREAD is a sorted list." ;; Go through all these summary buffers and offer to save them. (when buffers (save-excursion - (map-y-or-n-p - "Update summary buffer %s? " - (lambda (buf) - (switch-to-buffer buf) - (gnus-summary-exit)) - buffers))))) + (if (eq gnus-interactive-exit 'quiet) + (dolist (buffer buffers) + (switch-to-buffer buffer) + (gnus-summary-exit)) + (map-y-or-n-p + "Update summary buffer %s? " + (lambda (buf) + (switch-to-buffer buf) + (gnus-summary-exit)) + buffers)))))) (defun gnus-summary-setup-default-charset () "Setup newsgroup default charset." @@ -12743,6 +12744,8 @@ returned." gnus-newsgroup-headers (gnus-fetch-headers articles) 'gnus-article-sort-by-number)) + (setq gnus-newsgroup-articles + (gnus-sorted-nunion gnus-newsgroup-articles articles)) ;; Suppress duplicates? (when gnus-suppress-duplicates (gnus-dup-suppress-articles))