[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-group.el [lexbind]

[Miles Bader]

Index: emacs/lisp/gnus/gnus-group.el
diff -c emacs/lisp/gnus/gnus-group.el:1.19.2.5 
emacs/lisp/gnus/gnus-group.el:1.19.2.6
*** emacs/lisp/gnus/gnus-group.el:1.19.2.5      Mon Oct 25 04:19:42 2004
--- emacs/lisp/gnus/gnus-group.el       Mon Oct 25 04:22:23 2004
***************
*** 44,56 ****
  (eval-when-compile (require 'mm-url))
  
  (defcustom gnus-group-archive-directory
!   "address@hidden:/pub/emacs/ding-list/"
    "*The address of the (ding) archives."
    :group 'gnus-group-foreign
    :type 'directory)
  
  (defcustom gnus-group-recent-archive-directory
!   "address@hidden:/pub/emacs/ding-list-recent/"
    "*The address of the most recent (ding) articles."
    :group 'gnus-group-foreign
    :type 'directory)
--- 44,56 ----
  (eval-when-compile (require 'mm-url))
  
  (defcustom gnus-group-archive-directory
!   "/address@hidden:/pub/emacs/ding-list/"
    "*The address of the (ding) archives."
    :group 'gnus-group-foreign
    :type 'directory)
  
  (defcustom gnus-group-recent-archive-directory
!   "/address@hidden:/pub/emacs/ding-list-recent/"
    "*The address of the most recent (ding) articles."
    :group 'gnus-group-foreign
    :type 'directory)
***************
*** 2283,2290 ****
        (lambda (group)
          (gnus-group-delete-group group nil t))))))
  
- (defvar gnus-cache-active-altered)
- 
  (defun gnus-group-delete-group (group &optional force no-prompt)
    "Delete the current group.  Only meaningful with editable groups.
  If FORCE (the prefix) is non-nil, all the articles in the group will
--- 2283,2288 ----
***************
*** 2314,2323 ****
          (gnus-group-goto-group group)
          (gnus-group-kill-group 1 t)
          (gnus-sethash group nil gnus-active-hashtb)
-         (if (boundp 'gnus-cache-active-hashtb)
-             (when gnus-cache-active-hashtb
-               (gnus-sethash group nil gnus-cache-active-hashtb)
-               (setq gnus-cache-active-altered t)))
          t))
      (gnus-group-position-point)))
  
--- 2312,2317 ----
***************
*** 3133,3139 ****
    (let* ((entry (gnus-gethash group gnus-newsrc-hashtb))
         (num (car entry))
         (marks (nth 3 (nth 2 entry)))
!        (unread (gnus-list-of-unread-articles group)))
      ;; Remove entries for this group.
      (nnmail-purge-split-history (gnus-group-real-name group))
      ;; Do the updating only if the newsgroup isn't killed.
--- 3127,3133 ----
    (let* ((entry (gnus-gethash group gnus-newsrc-hashtb))
         (num (car entry))
         (marks (nth 3 (nth 2 entry)))
!        (unread (gnus-sequence-of-unread-articles group)))
      ;; Remove entries for this group.
      (nnmail-purge-split-history (gnus-group-real-name group))
      ;; Do the updating only if the newsgroup isn't killed.
***************
*** 3146,3161 ****
                                                 'del '(tick))
                                           (list (cdr (assq 'dormant marks))
                                                 'del '(dormant))))
!       (setq unread (gnus-uncompress-range
!                     (gnus-range-add (gnus-range-add
!                                      unread (cdr (assq 'dormant marks)))
!                                     (cdr (assq 'tick marks)))))
        (gnus-add-marked-articles group 'tick nil nil 'force)
        (gnus-add-marked-articles group 'dormant nil nil 'force))
        ;; Do auto-expirable marks if that's required.
        (when (gnus-group-auto-expirable-p group)
!       (gnus-add-marked-articles group 'expire unread)
!       (gnus-request-set-mark group (list (list unread 'add '(expire)))))
        (let ((gnus-newsgroup-name group))
        (gnus-run-hooks 'gnus-group-catchup-group-hook))
        num)))
--- 3140,3156 ----
                                                 'del '(tick))
                                           (list (cdr (assq 'dormant marks))
                                                 'del '(dormant))))
!       (setq unread (gnus-range-add (gnus-range-add
!                                     unread (cdr (assq 'dormant marks)))
!                                    (cdr (assq 'tick marks))))
        (gnus-add-marked-articles group 'tick nil nil 'force)
        (gnus-add-marked-articles group 'dormant nil nil 'force))
        ;; Do auto-expirable marks if that's required.
        (when (gnus-group-auto-expirable-p group)
!         (gnus-range-map (lambda (article)
!                           (gnus-add-marked-articles group 'expire (list 
article))
!                           (gnus-request-set-mark group (list (list (list 
article) 'add '(expire)))))
!                         unread))
        (let ((gnus-newsgroup-name group))
        (gnus-run-hooks 'gnus-group-catchup-group-hook))
        num)))
***************
*** 3517,3523 ****
    ;; First we make sure that we have really read the active file.
    (unless (gnus-read-active-file-p)
      (let ((gnus-read-active-file t)
!         (gnus-agent nil))             ; Trick the agent into ignoring the 
active file.
        (gnus-read-active-file)))
    ;; Find all groups and sort them.
    (let ((groups
--- 3512,3518 ----
    ;; First we make sure that we have really read the active file.
    (unless (gnus-read-active-file-p)
      (let ((gnus-read-active-file t)
!         (gnus-agent gnus-plugged)); If we're actually plugged, store the 
active file in the agent.
        (gnus-read-active-file)))
    ;; Find all groups and sort them.
    (let ((groups
***************
*** 3599,3605 ****
  (defun gnus-group-get-new-news-this-group (&optional n dont-scan)
    "Check for newly arrived news in the current group (and the N-1 next 
groups).
  The difference between N and the number of newsgroup checked is returned.
! If N is negative, this group and the N-1 previous groups will be checked."
    (interactive "P")
    (let* ((groups (gnus-group-process-prefix n))
         (ret (if (numberp n) (- n (length groups)) 0))
--- 3594,3601 ----
  (defun gnus-group-get-new-news-this-group (&optional n dont-scan)
    "Check for newly arrived news in the current group (and the N-1 next 
groups).
  The difference between N and the number of newsgroup checked is returned.
! If N is negative, this group and the N-1 previous groups will be checked.
! If DONT-SCAN is non-nil, scan non-activated groups as well."
    (interactive "P")
    (let* ((groups (gnus-group-process-prefix n))
         (ret (if (numberp n) (- n (length groups)) 0))