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

[Miles Bader]

Index: emacs/lisp/gnus/nnimap.el
diff -c emacs/lisp/gnus/nnimap.el:1.9 emacs/lisp/gnus/nnimap.el:1.10
*** emacs/lisp/gnus/nnimap.el:1.9       Wed Jan 15 20:19:03 2003
--- emacs/lisp/gnus/nnimap.el   Tue Feb  4 08:06:38 2003
***************
*** 369,375 ****
                                    maxuid (if maxuid (max maxuid uid) uid)))
                            'UID))
        (list (imap-mailbox-get 'exists) minuid maxuid)))))
!   
  (defun nnimap-possibly-change-group (group &optional server)
    "Make GROUP the current group, and SERVER the current server."
    (when (nnimap-possibly-change-server server)
--- 369,375 ----
                                    maxuid (if maxuid (max maxuid uid) uid)))
                            'UID))
        (list (imap-mailbox-get 'exists) minuid maxuid)))))
! 
  (defun nnimap-possibly-change-group (group &optional server)
    "Make GROUP the current group, and SERVER the current server."
    (when (nnimap-possibly-change-server server)
***************
*** 598,604 ****
           (port (if nnimap-server-port
                     (int-to-string nnimap-server-port)
                   "imap"))
!          (alist (gnus-netrc-machine list (or nnimap-server-address 
                                                 nnimap-address server)
                                        port "imap"))
           (user (gnus-netrc-get alist "login"))
--- 598,604 ----
           (port (if nnimap-server-port
                     (int-to-string nnimap-server-port)
                   "imap"))
!          (alist (gnus-netrc-machine list (or nnimap-server-address
                                                 nnimap-address server)
                                        port "imap"))
           (user (gnus-netrc-get alist "login"))
***************
*** 683,689 ****
      (insert
       (with-current-buffer nnimap-server-buffer
         (nnimap-demule
!         (if (imap-capability 'IMAP4rev1) 
              ;; xxx don't just use car? alist doesn't contain
              ;; anything else now, but it might...
              (nth 2 (car (imap-message-get (imap-current-message) 
'BODYDETAIL)))
--- 683,689 ----
      (insert
       (with-current-buffer nnimap-server-buffer
         (nnimap-demule
!         (if (imap-capability 'IMAP4rev1)
              ;; xxx don't just use car? alist doesn't contain
              ;; anything else now, but it might...
              (nth 2 (car (imap-message-get (imap-current-message) 
'BODYDETAIL)))
***************
*** 857,863 ****
        (with-current-buffer nnimap-server-buffer
        (gnus-message 5 "nnimap: Updating info for %s..."
                      (gnus-info-group info))
!       
        (when (nnimap-mark-permanent-p 'read)
          (let (seen unseen)
            ;; read info could contain articles marked unread by other
--- 857,863 ----
        (with-current-buffer nnimap-server-buffer
        (gnus-message 5 "nnimap: Updating info for %s..."
                      (gnus-info-group info))
! 
        (when (nnimap-mark-permanent-p 'read)
          (let (seen unseen)
            ;; read info could contain articles marked unread by other
***************
*** 897,903 ****
        ;; nnimap mark dormant article as ticked too (for other clients)
        ;; so we remove that mark for gnus since we support dormant
        (gnus-info-set-marks
!        info 
         (nnimap-update-alist-soft
          'tick
          (gnus-remove-from-range
--- 897,903 ----
        ;; nnimap mark dormant article as ticked too (for other clients)
        ;; so we remove that mark for gnus since we support dormant
        (gnus-info-set-marks
!        info
         (nnimap-update-alist-soft
          'tick
          (gnus-remove-from-range
***************
*** 905,911 ****
           (cdr-safe (assoc 'dormant (gnus-info-marks info))))
          (gnus-info-marks info))
         t)
!       
        (gnus-message 5 "nnimap: Updating info for %s...done"
                      (gnus-info-group info))
  
--- 905,911 ----
           (cdr-safe (assoc 'dormant (gnus-info-marks info))))
          (gnus-info-marks info))
         t)
! 
        (gnus-message 5 "nnimap: Updating info for %s...done"
                      (gnus-info-group info))
  
***************
*** 987,993 ****
                      to-groups)
                (or nnimap-split-crosspost
                    (throw 'split-done to-groups))))))))))
!   
  (defun nnimap-assoc-match (key alist)
    (let (element)
      (while (and alist (not element))
--- 987,993 ----
                      to-groups)
                (or nnimap-split-crosspost
                    (throw 'split-done to-groups))))))))))
! 
  (defun nnimap-assoc-match (key alist)
    (let (element)
      (while (and alist (not element))
***************
*** 1000,1006 ****
    (if (and (listp nnimap-split-rule) (listp (car nnimap-split-rule))
             (list (cdar nnimap-split-rule)) (listp (cadar nnimap-split-rule)))
        ;; extended format
!       (cadr (nnimap-assoc-match inbox (cdr (nnimap-assoc-match 
                                            server nnimap-split-rule))))
      nnimap-split-rule))
  
--- 1000,1006 ----
    (if (and (listp nnimap-split-rule) (listp (car nnimap-split-rule))
             (list (cdar nnimap-split-rule)) (listp (cadar nnimap-split-rule)))
        ;; extended format
!       (cadr (nnimap-assoc-match inbox (cdr (nnimap-assoc-match
                                            server nnimap-split-rule))))
      nnimap-split-rule))
  
***************
*** 1056,1062 ****
        (nnimap-before-find-minmax-bugworkaround)
        (dolist (pattern (nnimap-pattern-to-list-arguments
                        nnimap-list-pattern))
!       (dolist (mbx (imap-mailbox-lsub "*" (car pattern) nil 
                                        nnimap-server-buffer))
          (or (catch 'found
                (dolist (mailbox (imap-mailbox-get 'list-flags mbx
--- 1056,1062 ----
        (nnimap-before-find-minmax-bugworkaround)
        (dolist (pattern (nnimap-pattern-to-list-arguments
                        nnimap-list-pattern))
!       (dolist (mbx (imap-mailbox-lsub "*" (car pattern) nil
                                        nnimap-server-buffer))
          (or (catch 'found
                (dolist (mailbox (imap-mailbox-get 'list-flags mbx
***************
*** 1072,1078 ****
        (gnus-message 5 "nnimap: Listing subscribed mailboxes%s%s...done"
                    (if (> (length server) 0) " on " "") server))
      t))
!       
  (deffoo nnimap-request-create-group (group &optional server args)
    (when (nnimap-possibly-change-server server)
      (or (imap-mailbox-status group 'uidvalidity nnimap-server-buffer)
--- 1072,1078 ----
        (gnus-message 5 "nnimap: Listing subscribed mailboxes%s%s...done"
                    (if (> (length server) 0) " on " "") server))
      t))
! 
  (deffoo nnimap-request-create-group (group &optional server args)
    (when (nnimap-possibly-change-server server)
      (or (imap-mailbox-status group 'uidvalidity nnimap-server-buffer)
***************
*** 1154,1160 ****
               result)
             (nnimap-request-expire-articles (list article) group server t))
        result))))
!   
  (deffoo nnimap-request-accept-article (group &optional server last)
    (when (nnimap-possibly-change-server server)
      (let (uid)
--- 1154,1160 ----
               result)
             (nnimap-request-expire-articles (list article) group server t))
        result))))
! 
  (deffoo nnimap-request-accept-article (group &optional server last)
    (when (nnimap-possibly-change-server server)
      (let (uid)
***************
*** 1311,1317 ****
        (cdr alist)
        (setcdr alist (nnimap-remassoc key (cdr alist)))
        alist)))
!   
  (defun nnimap-update-alist-soft (key value alist)
    (if value
        (cons (cons key value) (nnimap-remassoc key alist))
--- 1311,1317 ----
        (cdr alist)
        (setcdr alist (nnimap-remassoc key (cdr alist)))
        alist)))
! 
  (defun nnimap-update-alist-soft (key value alist)
    (if value
        (cons (cons key value) (nnimap-remassoc key alist))