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

[Kim F . Storm]

Index: emacs/lisp/gnus/nnimap.el
diff -c emacs/lisp/gnus/nnimap.el:1.18 emacs/lisp/gnus/nnimap.el:1.19
*** emacs/lisp/gnus/nnimap.el:1.18      Mon Sep 20 12:03:05 2004
--- emacs/lisp/gnus/nnimap.el   Wed Feb  9 15:50:37 2005
***************
*** 211,217 ****
  used (which currently is nil, unless you use a statistical
  spam.el test); if this variable is another non-nil value bodies
  will be downloaded."
!   :version "21.4"
    :group 'nnimap
    :type '(choice (const :tag "Let system decide" deault)
                 boolean))
--- 211,217 ----
  used (which currently is nil, unless you use a statistical
  spam.el test); if this variable is another non-nil value bodies
  will be downloaded."
!   :version "22.1"
    :group 'nnimap
    :type '(choice (const :tag "Let system decide" deault)
                 boolean))
***************
*** 223,229 ****
  This means that errors caught by nnimap when closing the mailbox will
  not prevent Gnus from updating the group status, which may be harmful.
  However, it increases speed."
!   :version "21.4"
    :type 'boolean
    :group 'nnimap)
  
--- 223,229 ----
  This means that errors caught by nnimap when closing the mailbox will
  not prevent Gnus from updating the group status, which may be harmful.
  However, it increases speed."
!   :version "22.1"
    :type 'boolean
    :group 'nnimap)
  
***************
*** 232,238 ****
  This increases the speed of closing mailboxes (quiting group) but may
  decrease the speed of selecting another mailbox later.  Re-selecting
  the same mailbox will be faster though."
!   :version "21.4"
    :type 'boolean
    :group 'nnimap)
  
--- 232,238 ----
  This increases the speed of closing mailboxes (quiting group) but may
  decrease the speed of selecting another mailbox later.  Re-selecting
  the same mailbox will be faster though."
!   :version "22.1"
    :type 'boolean
    :group 'nnimap)
  
***************
*** 245,251 ****
  
  In summary, the default is O((1-p)*k+p*n) and changing it to nil makes
  it O(n).  If p is small, then the default is probably faster."
!   :version "21.4"
    :type 'boolean
    :group 'nnimap)
  
--- 245,251 ----
  
  In summary, the default is O((1-p)*k+p*n) and changing it to nil makes
  it O(n).  If p is small, then the default is probably faster."
!   :version "22.1"
    :type 'boolean
    :group 'nnimap)
  
***************
*** 826,832 ****
  
  (defun nnimap-make-callback (article gnus-callback buffer)
    "Return a callback function."
!   `(lambda () 
       (nnimap-callback ,article ,gnus-callback ,buffer)))
  
  (defun nnimap-callback (article gnus-callback buffer)
--- 826,832 ----
  
  (defun nnimap-make-callback (article gnus-callback buffer)
    "Return a callback function."
!   `(lambda ()
       (nnimap-callback ,article ,gnus-callback ,buffer)))
  
  (defun nnimap-callback (article gnus-callback buffer)
***************
*** 876,883 ****
                                   (imap-error-text nnimap-server-buffer))
                (cons group article)))
          (add-hook 'imap-fetch-data-hook
!                   (nnimap-make-callback article 
!                                         nnheader-callback-function 
                                          nntp-server-buffer))
          (imap-fetch-asynch article part nil nnimap-server-buffer)
          (cons group article))))))
--- 876,883 ----
                                   (imap-error-text nnimap-server-buffer))
                (cons group article)))
          (add-hook 'imap-fetch-data-hook
!                   (nnimap-make-callback article
!                                         nnheader-callback-function
                                          nntp-server-buffer))
          (imap-fetch-asynch article part nil nnimap-server-buffer)
          (cons group article))))))
***************
*** 930,936 ****
    "Update the unseen count in `nnimap-mailbox-info'."
    (gnus-sethash
     (gnus-group-prefixed-name group server)
!    (let ((old (gnus-gethash-safe (gnus-group-prefixed-name group server) 
                                 nnimap-mailbox-info)))
       (list (nth 0 old) (nth 1 old)
           (imap-mailbox-status group 'unseen nnimap-server-buffer)
--- 930,936 ----
    "Update the unseen count in `nnimap-mailbox-info'."
    (gnus-sethash
     (gnus-group-prefixed-name group server)
!    (let ((old (gnus-gethash-safe (gnus-group-prefixed-name group server)
                                 nnimap-mailbox-info)))
       (list (nth 0 old) (nth 1 old)
           (imap-mailbox-status group 'unseen nnimap-server-buffer)
***************
*** 1043,1049 ****
                             'asyncgroups
                           'slowgroups)
                         (list group (imap-mailbox-status-asynch
!                                     group '(uidvalidity uidnext unseen) 
                                      nnimap-server-buffer))))
          (dolist (asyncgroup asyncgroups)
            (let ((group (nth 0 asyncgroup))
--- 1043,1049 ----
                             'asyncgroups
                           'slowgroups)
                         (list group (imap-mailbox-status-asynch
!                                     group '(uidvalidity uidnext unseen)
                                      nnimap-server-buffer))))
          (dolist (asyncgroup asyncgroups)
            (let ((group (nth 0 asyncgroup))
***************
*** 1054,1060 ****
                              (nth 0 (gnus-gethash (gnus-group-prefixed-name
                                                    group server)
                                                   nnimap-mailbox-info))
!                             (imap-mailbox-get 'uidvalidity group 
                                                nnimap-server-buffer)))
                        (not (string=
                              (nth 1 (gnus-gethash (gnus-group-prefixed-name
--- 1054,1060 ----
                              (nth 0 (gnus-gethash (gnus-group-prefixed-name
                                                    group server)
                                                   nnimap-mailbox-info))
!                             (imap-mailbox-get 'uidvalidity group
                                                nnimap-server-buffer)))
                        (not (string=
                              (nth 1 (gnus-gethash (gnus-group-prefixed-name
***************
*** 1310,1316 ****
                             (let (msgid)
                               (and (setq msgid
                                          (nnmail-fetch-field "message-id"))
!                                   (nnmail-cache-insert msgid 
                                                         to-group
                                                         (nnmail-fetch-field 
"subject"))))))
                         ;; Add the group-art list to the history list.
--- 1310,1316 ----
                             (let (msgid)
                               (and (setq msgid
                                          (nnmail-fetch-field "message-id"))
!                                   (nnmail-cache-insert msgid
                                                         to-group
                                                         (nnmail-fetch-field 
"subject"))))))
                         ;; Add the group-art list to the history list.
***************
*** 1418,1429 ****
                        nnmail-expiry-wait)))
          (cond ((or force (eq days 'immediate))
                 (let ((oldarts (imap-search
!                                (concat "UID " 
                                         (imap-range-to-message-set artseq)))))
                   (when oldarts
                     (nnimap-expiry-target oldarts group server)
                     (when (imap-message-flags-add
!                           (imap-range-to-message-set 
                             (gnus-compress-sequence oldarts)) "\\Deleted")
                       (setq articles (gnus-set-difference
                                       articles oldarts))))))
--- 1418,1429 ----
                        nnmail-expiry-wait)))
          (cond ((or force (eq days 'immediate))
                 (let ((oldarts (imap-search
!                                (concat "UID "
                                         (imap-range-to-message-set artseq)))))
                   (when oldarts
                     (nnimap-expiry-target oldarts group server)
                     (when (imap-message-flags-add
!                           (imap-range-to-message-set
                             (gnus-compress-sequence oldarts)) "\\Deleted")
                       (setq articles (gnus-set-difference
                                       articles oldarts))))))
***************
*** 1437,1445 ****
                   (when oldarts
                     (nnimap-expiry-target oldarts group server)
                     (when (imap-message-flags-add
!                           (imap-range-to-message-set 
                             (gnus-compress-sequence oldarts)) "\\Deleted")
!                      (setq articles (gnus-set-difference 
                                       articles oldarts)))))))))))
    ;; return articles not deleted
    articles)
--- 1437,1445 ----
                   (when oldarts
                     (nnimap-expiry-target oldarts group server)
                     (when (imap-message-flags-add
!                           (imap-range-to-message-set
                             (gnus-compress-sequence oldarts)) "\\Deleted")
!                      (setq articles (gnus-set-difference
                                       articles oldarts)))))))))))
    ;; return articles not deleted
    articles)