emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Miles Bader
Subject: [Emacs-diffs] Changes to emacs/lisp/gnus/nnimap.el [emacs-unicode-2]
Date: Thu, 09 Sep 2004 17:45:38 -0400

Index: emacs/lisp/gnus/nnimap.el
diff -c emacs/lisp/gnus/nnimap.el:1.10.6.3 emacs/lisp/gnus/nnimap.el:1.10.6.4
*** emacs/lisp/gnus/nnimap.el:1.10.6.3  Tue Jun 29 16:45:23 2004
--- emacs/lisp/gnus/nnimap.el   Thu Sep  9 09:36:26 2004
***************
*** 1,6 ****
  ;;; nnimap.el --- imap backend for Gnus
! 
! ;; Copyright (C) 1998,1999,2000,01,02,2004  Free Software Foundation, Inc.
  
  ;; Author: Simon Josefsson <address@hidden>
  ;;         Jim Radford <address@hidden>
--- 1,6 ----
  ;;; nnimap.el --- imap backend for Gnus
! ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
! ;;        Free Software Foundation, Inc.
  
  ;; Author: Simon Josefsson <address@hidden>
  ;;         Jim Radford <address@hidden>
***************
*** 56,68 ****
  ;;   o What about Gnus's article editing, can we support it?  NO!
  ;;   o Use \Draft to support the draft group??
  ;;   o Duplicate suppression
  
  ;;; Code:
  
! (eval-and-compile
!   (require 'cl)
!   (require 'imap))
! 
  (require 'nnoo)
  (require 'nnmail)
  (require 'nnheader)
--- 56,66 ----
  ;;   o What about Gnus's article editing, can we support it?  NO!
  ;;   o Use \Draft to support the draft group??
  ;;   o Duplicate suppression
+ ;;   o Rewrite UID SEARCH UID X as UID FETCH X (UID) for those with slow 
servers
  
  ;;; Code:
  
! (require 'imap)
  (require 'nnoo)
  (require 'nnmail)
  (require 'nnheader)
***************
*** 72,104 ****
  (require 'gnus-start)
  (require 'gnus-int)
  
  (nnoo-declare nnimap)
  
! (defconst nnimap-version "nnimap 0.131")
  
  (defvoo nnimap-address nil
    "Address of physical IMAP server.  If nil, use the virtual server's name.")
  
  (defvoo nnimap-server-port nil
    "Port number on physical IMAP server.
! If nil, defaults to 993 for SSL connections and 143 otherwise.")
  
  ;; Splitting variables
  
! (defvar nnimap-split-crosspost t
    "If non-nil, do crossposting if several split methods match the mail.
! If nil, the first match found will be used.")
  
! (defvar nnimap-split-inbox nil
!   "*Name of mailbox to split mail from.
  
  Mail is read from this mailbox and split according to rules in
! `nnimap-split-rules'.
  
! This can be a string or a list of strings.")
  
! (defvar nnimap-split-rule nil
!   "*Mail will be split according to these rules.
  
  Mail is read from mailbox(es) specified in `nnimap-split-inbox'.
  
--- 70,124 ----
  (require 'gnus-start)
  (require 'gnus-int)
  
+ (eval-when-compile (require 'cl))
+ 
  (nnoo-declare nnimap)
  
! (defconst nnimap-version "nnimap 1.0")
! 
! (defgroup nnimap nil
!   "Reading IMAP mail with Gnus."
!   :group 'gnus)
  
  (defvoo nnimap-address nil
    "Address of physical IMAP server.  If nil, use the virtual server's name.")
  
  (defvoo nnimap-server-port nil
    "Port number on physical IMAP server.
! If nil, defaults to 993 for TLS/SSL connections and 143 otherwise.")
  
  ;; Splitting variables
  
! (defcustom nnimap-split-crosspost t
    "If non-nil, do crossposting if several split methods match the mail.
! If nil, the first match found will be used."
!   :group 'nnimap
!   :type 'boolean)
  
! (defcustom nnimap-split-inbox nil
!   "Name of mailbox to split mail from.
  
  Mail is read from this mailbox and split according to rules in
! `nnimap-split-rule'.
  
! This can be a string or a list of strings."
!   :group 'nnimap
!   :type '(choice (string)
!                (repeat string)))
! 
! (define-widget 'nnimap-strict-function 'function
!   "This widget only matches values that are functionp.
! 
! Warning: This means that a value that is the symbol of a not yet
! loaded function will not match.  Use with care."
!   :match 'nnimap-strict-function-match)
! 
! (defun nnimap-strict-function-match (widget value)
!   "Ignoring WIDGET, match if VALUE is a function."
!   (functionp value))
  
! (defcustom nnimap-split-rule nil
!   "Mail will be split according to these rules.
  
  Mail is read from mailbox(es) specified in `nnimap-split-inbox'.
  
***************
*** 110,119 ****
  \(setq nnimap-split-rule '((\"INBOX.gnus-imap\"   \"From:.*gnus-imap\")
                          (\"INBOX.junk\"        \"Subject:.*buy\")))
  
! As you can see, `nnimap-split-rule' is a list of lists, where the first
! element in each \"rule\" is the name of the IMAP mailbox, and the
! second is a regexp that nnimap will try to match on the header to find
! a fit.
  
  The second element can also be a function.  In that case, it will be
  called narrowed to the headers with the first element of the rule as
--- 130,139 ----
  \(setq nnimap-split-rule '((\"INBOX.gnus-imap\"   \"From:.*gnus-imap\")
                          (\"INBOX.junk\"        \"Subject:.*buy\")))
  
! As you can see, `nnimap-split-rule' is a list of lists, where the
! first element in each \"rule\" is the name of the IMAP mailbox (or the
! symbol `junk' if you want to remove the mail), and the second is a
! regexp that nnimap will try to match on the header to find a fit.
  
  The second element can also be a function.  In that case, it will be
  called narrowed to the headers with the first element of the rule as
***************
*** 130,156 ****
  
  \(setq nnimap-split-rule
        '((\"my1server\"    (\".*\"    ((\"ding\"    \"address@hidden")
!                                   (\"junk\"    \"From:.*Simon\")))
!         (\"my2server\"    (\"INBOX\" nnimap-split-fancy))
!         (\"my[34]server\" (\".*\"    ((\"private\" \"To:.*Simon\")
!                                   (\"junk\"    my-junk-func)))))
  
  The virtual server name is in fact a regexp, so that the same rules
  may apply to several servers.  In the example, the servers
  \"my3server\" and \"my4server\" both use the same rules.  Similarly,
  the inbox string is also a regexp.  The actual splitting rules are as
  before, either a function, or a list with group/regexp or
! group/function elements.")
  
! (defvar nnimap-split-predicate "UNSEEN UNDELETED"
    "The predicate used to find articles to split.
  If you use another IMAP client to peek on articles but always would
  like nnimap to split them once it's started, you could change this to
  \"UNDELETED\". Other available predicates are available in
! RFC2060 section 6.4.4.")
  
! (defvar nnimap-split-fancy nil
!   "Like `nnmail-split-fancy', which see.")
  
  ;; Authorization / Privacy variables
  
--- 150,253 ----
  
  \(setq nnimap-split-rule
        '((\"my1server\"    (\".*\"    ((\"ding\"    \"address@hidden")
!                                 (\"junk\"    \"From:.*Simon\")))
!       (\"my2server\"    (\"INBOX\" nnimap-split-fancy))
!       (\"my[34]server\" (\".*\"    ((\"private\" \"To:.*Simon\")
!                                 (\"junk\"    my-junk-func)))))
  
  The virtual server name is in fact a regexp, so that the same rules
  may apply to several servers.  In the example, the servers
  \"my3server\" and \"my4server\" both use the same rules.  Similarly,
  the inbox string is also a regexp.  The actual splitting rules are as
  before, either a function, or a list with group/regexp or
! group/function elements."
!   :group 'nnimap
!   :type '(choice :tag "Rule type"
!                (repeat :menu-tag "Single-server"
!                        :tag "Single-server list"
!                        (list (string :tag "Mailbox")
!                              (choice :tag "Predicate"
!                                      (regexp :tag "A regexp")
!                                      (nnimap-strict-function :tag "A 
function"))))
!                (choice :menu-tag "A function"
!                        :tag "A function"
!                        (function-item nnimap-split-fancy)
!                        (function-item nnmail-split-fancy)
!                        (nnimap-strict-function :tag "User-defined function"))
!                (repeat :menu-tag "Multi-server (extended)"
!                        :tag "Multi-server list"
!                        (list (regexp :tag "Server regexp")
!                              (list (regexp :tag "Incoming Mailbox regexp")
!                                    (repeat :tag "Rules for matching server(s) 
and mailbox(es)"
!                                            (list (string :tag "Destination 
mailbox")
!                                                  (choice :tag "Predicate"
!                                                          (regexp :tag "A 
Regexp")
!                                                          
(nnimap-strict-function :tag "A Function")))))))))
  
! (defcustom nnimap-split-predicate "UNSEEN UNDELETED"
    "The predicate used to find articles to split.
  If you use another IMAP client to peek on articles but always would
  like nnimap to split them once it's started, you could change this to
  \"UNDELETED\". Other available predicates are available in
! RFC2060 section 6.4.4."
!   :group 'nnimap
!   :type 'string)
! 
! (defcustom nnimap-split-fancy nil
!   "Like the variable `nnmail-split-fancy'."
!   :group 'nnimap
!   :type 'sexp)
! 
! (defvar nnimap-split-download-body-default nil
!   "Internal variable with default value for `nnimap-split-download-body'.")
! 
! (defcustom nnimap-split-download-body 'default
!   "Whether to download entire articles during splitting.
! This is generally not required, and will slow things down considerably.
! You may need it if you want to use an advanced splitting function that
! analyses the body before splitting the article.
! If this variable is nil, bodies will not be downloaded; if this
! variable is the symbol `default' the default behaviour is
! 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."
!   :group 'nnimap
!   :type '(choice (const :tag "Let system decide" deault)
!                boolean))
! 
! ;; Performance / bug workaround variables
! 
! (defcustom nnimap-close-asynchronous t
!   "Close mailboxes asynchronously in `nnimap-close-group'.
! This means that errors cought by nnimap when closing the mailbox will
! not prevent Gnus from updating the group status, which may be harmful.
! However, it increases speed."
!   :type 'boolean
!   :group 'nnimap)
! 
! (defcustom nnimap-dont-close t
!   "Never close mailboxes.
! 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."
!   :type 'boolean
!   :group 'nnimap)
! 
! (defcustom nnimap-retrieve-groups-asynchronous t
!   "Send asynchronous STATUS commands for each mailbox before checking mail.
! If you have mailboxes that rarely receives mail, this speeds up new
! mail checking.  It works by first sending STATUS commands for each
! mailbox, and then only checking groups which has a modified UIDNEXT
! more carefully for new mail.
! 
! 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."
!   :type 'boolean
!   :group 'nnimap)
  
! (defvoo nnimap-need-unselect-to-notice-new-mail nil
!   "Unselect mailboxes before looking for new mail in them.
! Some servers seem to need this under some circumstances.")
  
  ;; Authorization / Privacy variables
  
***************
*** 165,178 ****
  
  Change this if
  
! 1) you want to connect with SSL.  The SSL integration with IMAP is
!    brain-dead so you'll have to tell it specifically.
  
  2) your server is more capable than your environment -- i.e. your
     server accept Kerberos login's but you haven't installed the
     `imtest' program or your machine isn't configured for Kerberos.
  
! Possible choices: kerberos4, ssl, network")
  
  (defvoo nnimap-authenticator nil
    "How nnimap authenticate itself to the server.
--- 262,277 ----
  
  Change this if
  
! 1) you want to connect with TLS/SSL.  The TLS/SSL integration
!    with IMAP is suboptimal so you'll have to tell it
!    specifically.
  
  2) your server is more capable than your environment -- i.e. your
     server accept Kerberos login's but you haven't installed the
     `imtest' program or your machine isn't configured for Kerberos.
  
! Possible choices: gssapi, kerberos4, starttls, tls, ssl, network, shell.
! See also `imap-streams' and `imap-stream-alist'.")
  
  (defvoo nnimap-authenticator nil
    "How nnimap authenticate itself to the server.
***************
*** 186,192 ****
  installed the `imtest' program or your machine isn't configured for
  Kerberos.
  
! Possible choices: kerberos4, cram-md5, login, anonymous.")
  
  (defvoo nnimap-directory (nnheader-concat gnus-directory "overview/")
    "Directory to keep NOV cache files for nnimap groups.
--- 285,292 ----
  installed the `imtest' program or your machine isn't configured for
  Kerberos.
  
! Possible choices: gssapi, kerberos4, digest-md5, cram-md5, login, anonymous.
! See also `imap-authenticators' and `imap-authenticator-alist'")
  
  (defvoo nnimap-directory (nnheader-concat gnus-directory "overview/")
    "Directory to keep NOV cache files for nnimap groups.
***************
*** 203,211 ****
  (defvoo nnimap-nov-file-name-suffix ".novcache"
    "Suffix for NOV cache base filename.")
  
! (defvoo nnimap-nov-is-evil nil
!   "If non-nil, nnimap will never generate or use a local nov database for 
this backend.
! Using nov databases will speed up header fetching considerably.
  Unlike other backends, you do not need to take special care if you
  flip this variable.")
  
--- 303,314 ----
  (defvoo nnimap-nov-file-name-suffix ".novcache"
    "Suffix for NOV cache base filename.")
  
! (defvoo nnimap-nov-is-evil gnus-agent
!   "If non-nil, never generate or use a local nov database for this backend.
! Using nov databases should speed up header fetching considerably.
! However, it will invoke a UID SEARCH UID command on the server, and
! some servers implement this command inefficiently by opening each and
! every message in the group, thus making it quite slow.
  Unlike other backends, you do not need to take special care if you
  flip this variable.")
  
***************
*** 238,244 ****
  everything in the current hierarchy.")
  
  (defvoo nnimap-news-groups nil
!   "IMAP support a news-like mode, also known as bulletin board mode, where 
replies is sent via IMAP instead of SMTP.
  
  This variable should contain a regexp matching groups where you wish
  replies to be stored to the mailbox directly.
--- 341,348 ----
  everything in the current hierarchy.")
  
  (defvoo nnimap-news-groups nil
!   "IMAP support a news-like mode, also known as bulletin board mode,
! where replies is sent via IMAP instead of SMTP.
  
  This variable should contain a regexp matching groups where you wish
  replies to be stored to the mailbox directly.
***************
*** 253,258 ****
--- 357,378 ----
  similar which you wouldn't want to set up a mailing list for, you can
  use this to make replies go directly to the group.")
  
+ (defvoo nnimap-expunge-search-string "UID %s NOT SINCE %s"
+   "IMAP search command to use for articles that are to be expired.
+ The first %s is replaced by a UID set of articles to search on,
+ and the second %s is replaced by a date criterium.
+ 
+ One useful (and perhaps the only useful) value to change this to would
+ be `UID %s NOT SENTSINCE %s' to make nnimap use the Date: header
+ instead of the internal date of messages.  See section 6.4.4 of RFC
+ 2060 for more information on valid strings.")
+ 
+ (defvoo nnimap-importantize-dormant t
+   "If non-nil, mark \"dormant\" articles as \"ticked\" for other IMAP clients.
+ Note that within Gnus, dormant articles will still (only) be
+ marked as ticked.  This is to make \"dormant\" articles stand out,
+ just like \"ticked\" articles, in other IMAP clients.")
+ 
  (defvoo nnimap-server-address nil
    "Obsolete.  Use `nnimap-address'.")
  
***************
*** 284,294 ****
  If this is 'imap-mailbox-lsub, then use a server-side subscription list to
  restrict visible folders.")
  
  ;; Internal variables:
  
! (defvar nnimap-debug nil
!   "Name of buffer to record debugging info.
! For example: (setq nnimap-debug \"*nnimap-debug*\")")
  (defvar nnimap-current-move-server nil)
  (defvar nnimap-current-move-group nil)
  (defvar nnimap-current-move-article nil)
--- 404,418 ----
  If this is 'imap-mailbox-lsub, then use a server-side subscription list to
  restrict visible folders.")
  
+ (defcustom nnimap-debug nil
+   "If non-nil, random debug spews are placed in *nnimap-debug* buffer."
+   :group 'nnimap
+   :type 'boolean)
+ 
  ;; Internal variables:
  
! (defvar nnimap-debug-buffer "*nnimap-debug*")
! (defvar nnimap-mailbox-info (gnus-make-hashtable 997))
  (defvar nnimap-current-move-server nil)
  (defvar nnimap-current-move-group nil)
  (defvar nnimap-current-move-article nil)
***************
*** 296,308 ****
  (defvar nnimap-progress-chars '(?| ?/ ?- ?\\))
  (defvar nnimap-progress-how-often 20)
  (defvar nnimap-counter)
- (defvar nnimap-callback-callback-function nil
-   "Gnus callback the nnimap asynchronous callback should call.")
- (defvar nnimap-callback-buffer nil
-   "Which buffer the asynchronous article prefetch callback should work in.")
  (defvar nnimap-server-buffer-alist nil)       ;; Map server name to buffers.
! (defvar nnimap-current-server nil)    ;; Current server
! (defvar nnimap-server-buffer nil)     ;; Current servers' buffer
  
  
  
--- 420,428 ----
  (defvar nnimap-progress-chars '(?| ?/ ?- ?\\))
  (defvar nnimap-progress-how-often 20)
  (defvar nnimap-counter)
  (defvar nnimap-server-buffer-alist nil)       ;; Map server name to buffers.
! (defvar nnimap-current-server nil) ;; Current server
! (defvar nnimap-server-buffer nil) ;; Current servers' buffer
  
  
  
***************
*** 328,340 ****
         (new-uidvalidity (imap-mailbox-get 'uidvalidity))
         (old-uidvalidity (gnus-group-get-parameter gnusgroup 'uidvalidity))
         (dir (file-name-as-directory (expand-file-name nnimap-directory)))
!          (nameuid (nnheader-translate-file-chars
!                    (concat nnimap-nov-file-name
!                            (if (equal server "")
!                                "unnamed"
!                              server) "." group "." old-uidvalidity
!                              nnimap-nov-file-name-suffix) t))
!          (file (if (or nnmail-use-long-file-names
                       (file-exists-p (expand-file-name nameuid dir)))
                   (expand-file-name nameuid dir)
                 (expand-file-name
--- 448,460 ----
         (new-uidvalidity (imap-mailbox-get 'uidvalidity))
         (old-uidvalidity (gnus-group-get-parameter gnusgroup 'uidvalidity))
         (dir (file-name-as-directory (expand-file-name nnimap-directory)))
!        (nameuid (nnheader-translate-file-chars
!                  (concat nnimap-nov-file-name
!                          (if (equal server "")
!                              "unnamed"
!                            server) "." group "." old-uidvalidity
!                          nnimap-nov-file-name-suffix) t))
!        (file (if (or nnmail-use-long-file-names
                       (file-exists-p (expand-file-name nameuid dir)))
                   (expand-file-name nameuid dir)
                 (expand-file-name
***************
*** 354,369 ****
  (defun nnimap-before-find-minmax-bugworkaround ()
    "Function called before iterating through mailboxes with
  `nnimap-find-minmax-uid'."
!   ;; XXX this is for UoW imapd problem, it doesn't notice new mail in
!   ;; currently selected mailbox without a re-select/examine.
!   (or (null (imap-current-mailbox nnimap-server-buffer))
!       (imap-mailbox-unselect nnimap-server-buffer)))
  
  (defun nnimap-find-minmax-uid (group &optional examine)
    "Find lowest and highest active article number in GROUP.
  If EXAMINE is non-nil the group is selected read-only."
    (with-current-buffer nnimap-server-buffer
!     (when (imap-mailbox-select group examine)
        (let (minuid maxuid)
        (when (> (imap-mailbox-get 'exists) 0)
          (imap-fetch "1,*" "UID" nil 'nouidfetch)
--- 474,491 ----
  (defun nnimap-before-find-minmax-bugworkaround ()
    "Function called before iterating through mailboxes with
  `nnimap-find-minmax-uid'."
!   (when nnimap-need-unselect-to-notice-new-mail
!     ;; XXX this is for UoW imapd problem, it doesn't notice new mail in
!     ;; currently selected mailbox without a re-select/examine.
!     (or (null (imap-current-mailbox nnimap-server-buffer))
!       (imap-mailbox-unselect nnimap-server-buffer))))
  
  (defun nnimap-find-minmax-uid (group &optional examine)
    "Find lowest and highest active article number in GROUP.
  If EXAMINE is non-nil the group is selected read-only."
    (with-current-buffer nnimap-server-buffer
!     (when (or (string= group (imap-current-mailbox))
!             (imap-mailbox-select group examine))
        (let (minuid maxuid)
        (when (> (imap-mailbox-get 'exists) 0)
          (imap-fetch "1,*" "UID" nil 'nouidfetch)
***************
*** 383,388 ****
--- 505,512 ----
            (if (or (nnimap-verify-uidvalidity
                     group (or server nnimap-current-server))
                    (zerop (imap-mailbox-get 'exists group))
+                   t ;; for OGnus to see if ignoring uidvalidity
+                   ;; changes has any bad effects.
                    (yes-or-no-p
                     (format
                      "nnimap: Group %s is not uidvalid.  Continue? " group)))
***************
*** 428,437 ****
         (with-temp-buffer
         (buffer-disable-undo)
         (insert headers)
!        (nnheader-ms-strip-cr)
!        (nnheader-fold-continuation-lines)
!        (subst-char-in-region (point-min) (point-max) ?\t ? )
!        (let ((head (nnheader-parse-head 'naked)))
           (mail-header-set-number head uid)
           (mail-header-set-chars head chars)
           (mail-header-set-lines head lines)
--- 552,558 ----
         (with-temp-buffer
         (buffer-disable-undo)
         (insert headers)
!        (let ((head (nnheader-parse-naked-head)))
           (mail-header-set-number head uid)
           (mail-header-set-chars head chars)
           (mail-header-set-lines head lines)
***************
*** 456,499 ****
                           articles)))))
        (mapcar (lambda (msgid)
                (imap-search
!                (format "HEADER Message-Id %s" msgid)))
              articles))))
  
  (defun nnimap-group-overview-filename (group server)
    "Make file name for GROUP on SERVER."
    (let* ((dir (file-name-as-directory (expand-file-name nnimap-directory)))
!          (uidvalidity (gnus-group-get-parameter
!                        (gnus-group-prefixed-name
!                         group (gnus-server-to-method
!                                (format "nnimap:%s" server)))
!                        'uidvalidity))
!          (name (nnheader-translate-file-chars
!                 (concat nnimap-nov-file-name
!                         (if (equal server "")
!                             "unnamed"
!                           server) "." group nnimap-nov-file-name-suffix) t))
!          (nameuid (nnheader-translate-file-chars
!                    (concat nnimap-nov-file-name
!                            (if (equal server "")
!                                "unnamed"
!                              server) "." group "." uidvalidity
!                              nnimap-nov-file-name-suffix) t))
!          (oldfile (if (or nnmail-use-long-file-names
!                           (file-exists-p (expand-file-name name dir)))
!                       (expand-file-name name dir)
!                     (expand-file-name
!                      (mm-encode-coding-string
!                       (nnheader-replace-chars-in-string name ?. ?/)
!                       nnmail-pathname-coding-system)
!                      dir)))
!          (newfile (if (or nnmail-use-long-file-names
!                           (file-exists-p (expand-file-name nameuid dir)))
!                       (expand-file-name nameuid dir)
!                     (expand-file-name
!                      (mm-encode-coding-string
!                       (nnheader-replace-chars-in-string nameuid ?. ?/)
!                       nnmail-pathname-coding-system)
!                      dir))))
      (when (and (file-exists-p oldfile) (not (file-exists-p newfile)))
        (message "nnimap: Upgrading novcache filename...")
        (sit-for 1)
--- 577,620 ----
                           articles)))))
        (mapcar (lambda (msgid)
                (imap-search
!                (format "HEADER Message-Id \"%s\"" msgid)))
              articles))))
  
  (defun nnimap-group-overview-filename (group server)
    "Make file name for GROUP on SERVER."
    (let* ((dir (file-name-as-directory (expand-file-name nnimap-directory)))
!        (uidvalidity (gnus-group-get-parameter
!                      (gnus-group-prefixed-name
!                       group (gnus-server-to-method
!                              (format "nnimap:%s" server)))
!                      'uidvalidity))
!        (name (nnheader-translate-file-chars
!               (concat nnimap-nov-file-name
!                       (if (equal server "")
!                           "unnamed"
!                         server) "." group nnimap-nov-file-name-suffix) t))
!        (nameuid (nnheader-translate-file-chars
!                  (concat nnimap-nov-file-name
!                          (if (equal server "")
!                              "unnamed"
!                            server) "." group "." uidvalidity
!                          nnimap-nov-file-name-suffix) t))
!        (oldfile (if (or nnmail-use-long-file-names
!                         (file-exists-p (expand-file-name name dir)))
!                     (expand-file-name name dir)
!                   (expand-file-name
!                    (mm-encode-coding-string
!                     (nnheader-replace-chars-in-string name ?. ?/)
!                     nnmail-pathname-coding-system)
!                    dir)))
!        (newfile (if (or nnmail-use-long-file-names
!                         (file-exists-p (expand-file-name nameuid dir)))
!                     (expand-file-name nameuid dir)
!                   (expand-file-name
!                    (mm-encode-coding-string
!                     (nnheader-replace-chars-in-string nameuid ?. ?/)
!                     nnmail-pathname-coding-system)
!                    dir))))
      (when (and (file-exists-p oldfile) (not (file-exists-p newfile)))
        (message "nnimap: Upgrading novcache filename...")
        (sit-for 1)
***************
*** 540,546 ****
           (> nnimap-length nnmail-large-newsgroup)
           (nnheader-message 6 "nnimap: Retrieving headers...done")))))
  
! (defun nnimap-use-nov-p (group server)
    (or gnus-nov-is-evil nnimap-nov-is-evil
        (unless (and (gnus-make-directory
                    (file-name-directory
--- 661,667 ----
           (> nnimap-length nnmail-large-newsgroup)
           (nnheader-message 6 "nnimap: Retrieving headers...done")))))
  
! (defun nnimap-dont-use-nov-p (group server)
    (or gnus-nov-is-evil nnimap-nov-is-evil
        (unless (and (gnus-make-directory
                    (file-name-directory
***************
*** 554,560 ****
    (when (nnimap-possibly-change-group group server)
      (with-current-buffer nntp-server-buffer
        (erase-buffer)
!       (if (nnimap-use-nov-p group server)
          (nnimap-retrieve-headers-from-server
           (gnus-compress-sequence articles) group server)
        (let (uids cached low high)
--- 675,681 ----
    (when (nnimap-possibly-change-group group server)
      (with-current-buffer nntp-server-buffer
        (erase-buffer)
!       (if (nnimap-dont-use-nov-p group server)
          (nnimap-retrieve-headers-from-server
           (gnus-compress-sequence articles) group server)
        (let (uids cached low high)
***************
*** 577,584 ****
                    ;; remove nov's for articles which has expired on server
                    (goto-char (point-min))
                    (dolist (uid (gnus-set-difference articles uids))
!                       (when (re-search-forward (format "^%d\t" uid) nil t)
!                         (gnus-delete-line)))))
              ;; nothing cached, fetch whole range from server
              (nnimap-retrieve-headers-from-server
               (cons low high) group server))
--- 698,705 ----
                    ;; remove nov's for articles which has expired on server
                    (goto-char (point-min))
                    (dolist (uid (gnus-set-difference articles uids))
!                     (when (re-search-forward (format "^%d\t" uid) nil t)
!                       (gnus-delete-line)))))
              ;; nothing cached, fetch whole range from server
              (nnimap-retrieve-headers-from-server
               (cons low high) group server))
***************
*** 601,609 ****
           (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"))
           (passwd (gnus-netrc-get alist "password")))
        (if (imap-authenticate user passwd nnimap-server-buffer)
--- 722,732 ----
           (port (if nnimap-server-port
                     (int-to-string nnimap-server-port)
                   "imap"))
!          (alist (or (gnus-netrc-machine list server port "imap")
!                     (gnus-netrc-machine list
!                                         (or nnimap-server-address
!                                             nnimap-address)
!                                         port "imap")))
           (user (gnus-netrc-get alist "login"))
           (passwd (gnus-netrc-get alist "password")))
        (if (imap-authenticate user passwd nnimap-server-buffer)
***************
*** 629,638 ****
                      (cadr (assq 'nnimap-server-address defs))) defs)
        (push (list 'nnimap-address server) defs)))
      (nnoo-change-server 'nnimap server defs)
      (with-current-buffer (get-buffer-create nnimap-server-buffer)
        (nnoo-change-server 'nnimap server defs))
      (or (and nnimap-server-buffer
!            (imap-opened nnimap-server-buffer))
        (nnimap-open-connection server))))
  
  (deffoo nnimap-server-opened (&optional server)
--- 752,768 ----
                      (cadr (assq 'nnimap-server-address defs))) defs)
        (push (list 'nnimap-address server) defs)))
      (nnoo-change-server 'nnimap server defs)
+     (or nnimap-server-buffer
+       (setq nnimap-server-buffer (cadr (assq 'nnimap-server-buffer defs))))
      (with-current-buffer (get-buffer-create nnimap-server-buffer)
        (nnoo-change-server 'nnimap server defs))
      (or (and nnimap-server-buffer
!            (imap-opened nnimap-server-buffer)
!            (if (with-current-buffer nnimap-server-buffer
!                  (memq imap-state '(auth select examine)))
!                t
!              (imap-close nnimap-server-buffer)
!              (nnimap-open-connection server)))
        (nnimap-open-connection server))))
  
  (deffoo nnimap-server-opened (&optional server)
***************
*** 683,730 ****
             'identity)
           (or string "")))
  
! (defun nnimap-callback ()
!   (remove-hook 'imap-fetch-data-hook 'nnimap-callback)
!   (with-current-buffer nnimap-callback-buffer
!     (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)))
!           (imap-message-get (imap-current-message) 'RFC822)))))
!     (nnheader-ms-strip-cr)
!     (funcall nnimap-callback-callback-function t)))
  
  (defun nnimap-request-article-part (article part prop &optional
!                                             group server to-buffer detail)
    (when (nnimap-possibly-change-group group server)
      (let ((article (if (stringp article)
                       (car-safe (imap-search
!                                 (format "HEADER Message-Id %s" article)
                                  nnimap-server-buffer))
                     article)))
        (when article
!       (gnus-message 10 "nnimap: Fetching (part of) article %d..." article)
        (if (not nnheader-callback-function)
            (with-current-buffer (or to-buffer nntp-server-buffer)
              (erase-buffer)
!               (let ((data (imap-fetch article part prop nil
!                                       nnimap-server-buffer)))
!                 (insert (nnimap-demule (if detail
!                                            (nth 2 (car data))
!                                          data))))
!               (nnheader-ms-strip-cr)
!             (gnus-message 10 "nnimap: Fetching (part of) article %d...done"
!                           article)
              (if (bobp)
!                 (nnheader-report 'nnimap "No such article: %s"
                                   (imap-error-text nnimap-server-buffer))
                (cons group article)))
!         (add-hook 'imap-fetch-data-hook 'nnimap-callback)
!         (setq nnimap-callback-callback-function nnheader-callback-function
!               nnimap-callback-buffer nntp-server-buffer)
          (imap-fetch-asynch article part nil nnimap-server-buffer)
          (cons group article))))))
  
--- 813,873 ----
             'identity)
           (or string "")))
  
! (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)
!   (when (eq article (imap-current-message))
!     (remove-hook 'imap-fetch-data-hook
!                (nnimap-make-callback article gnus-callback buffer))
!     (with-current-buffer buffer
!       (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 article 'BODYDETAIL)))
!           (imap-message-get article 'RFC822)))))
!       (nnheader-ms-strip-cr)
!       (funcall gnus-callback t))))
  
  (defun nnimap-request-article-part (article part prop &optional
!                                           group server to-buffer detail)
    (when (nnimap-possibly-change-group group server)
      (let ((article (if (stringp article)
                       (car-safe (imap-search
!                                 (format "HEADER Message-Id \"%s\"" article)
                                  nnimap-server-buffer))
                     article)))
        (when article
!       (gnus-message 10 "nnimap: Fetching (part of) article %d from %s..."
!                     article (or group imap-current-mailbox
!                                 gnus-newsgroup-name))
        (if (not nnheader-callback-function)
            (with-current-buffer (or to-buffer nntp-server-buffer)
              (erase-buffer)
!             (let ((data (imap-fetch article part prop nil
!                                     nnimap-server-buffer)))
!               (insert (nnimap-demule (if detail
!                                          (nth 2 (car data))
!                                        data))))
!             (nnheader-ms-strip-cr)
!             (gnus-message
!              10 "nnimap: Fetching (part of) article %d from %s...done"
!              article (or group imap-current-mailbox gnus-newsgroup-name))
              (if (bobp)
!                 (nnheader-report 'nnimap "No such article %d in %s: %s"
!                                  article (or group imap-current-mailbox
!                                              gnus-newsgroup-name)
                                   (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))))))
  
***************
*** 772,791 ****
             (nnheader-report 'nnimap "Group %s selected" group)
             t)))))
  
  (defun nnimap-close-group (group &optional server)
    (with-current-buffer nnimap-server-buffer
      (when (and (imap-opened)
               (nnimap-possibly-change-group group server))
        (case nnimap-expunge-on-close
!       ('always (imap-mailbox-expunge)
!                (imap-mailbox-close))
!       ('ask (if (and (imap-search "DELETED")
!                      (gnus-y-or-n-p (format
!                                      "Expunge articles in group `%s'? "
!                                      imap-current-mailbox)))
!                 (progn (imap-mailbox-expunge)
!                        (imap-mailbox-close))
!               (imap-mailbox-unselect)))
        (t (imap-mailbox-unselect)))
        (not imap-current-mailbox))))
  
--- 915,949 ----
             (nnheader-report 'nnimap "Group %s selected" group)
             t)))))
  
+ (defun nnimap-update-unseen (group &optional server)
+   "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)
+          (nth 3 old)))
+    nnimap-mailbox-info))
+ 
  (defun nnimap-close-group (group &optional server)
    (with-current-buffer nnimap-server-buffer
      (when (and (imap-opened)
               (nnimap-possibly-change-group group server))
+       (nnimap-update-unseen group server)
        (case nnimap-expunge-on-close
!       (always (progn
!                 (imap-mailbox-expunge nnimap-close-asynchronous)
!                 (unless nnimap-dont-close
!                   (imap-mailbox-close nnimap-close-asynchronous))))
!       (ask (if (and (imap-search "DELETED")
!                     (gnus-y-or-n-p (format "Expunge articles in group `%s'? "
!                                            imap-current-mailbox)))
!                (progn
!                  (imap-mailbox-expunge nnimap-close-asynchronous)
!                  (unless nnimap-dont-close
!                    (imap-mailbox-close nnimap-close-asynchronous)))
!              (imap-mailbox-unselect)))
        (t (imap-mailbox-unselect)))
        (not imap-current-mailbox))))
  
***************
*** 812,820 ****
              (let ((info (nnimap-find-minmax-uid mbx 'examine)))
                (when info
                  (with-current-buffer nntp-server-buffer
!                    (insert (format "\"%s\" %d %d y\n"
!                                    mbx (or (nth 2 info) 0)
!                                    (max 1 (or (nth 1 info) 1)))))))))))
      (gnus-message 5 "nnimap: Generating active list%s...done"
                  (if (> (length server) 0) (concat " for " server) ""))
      t))
--- 970,978 ----
              (let ((info (nnimap-find-minmax-uid mbx 'examine)))
                (when info
                  (with-current-buffer nntp-server-buffer
!                   (insert (format "\"%s\" %d %d y\n"
!                                   mbx (or (nth 2 info) 0)
!                                   (max 1 (or (nth 1 info) 1)))))))))))
      (gnus-message 5 "nnimap: Generating active list%s...done"
                  (if (> (length server) 0) (concat " for " server) ""))
      t))
***************
*** 822,829 ****
  (deffoo nnimap-request-post (&optional server)
    (let ((success t))
      (dolist (mbx (message-unquote-tokens
!                   (message-tokenize-header
!                    (message-fetch-field "Newsgroups") ", ")) success)
        (let ((to-newsgroup (gnus-group-prefixed-name mbx gnus-command-method)))
        (or (gnus-active to-newsgroup)
            (gnus-activate-group to-newsgroup)
--- 980,987 ----
  (deffoo nnimap-request-post (&optional server)
    (let ((success t))
      (dolist (mbx (message-unquote-tokens
!                 (message-tokenize-header
!                  (message-fetch-field "Newsgroups") ", ")) success)
        (let ((to-newsgroup (gnus-group-prefixed-name mbx gnus-command-method)))
        (or (gnus-active to-newsgroup)
            (gnus-activate-group to-newsgroup)
***************
*** 840,865 ****
  
  ;; Optional backend functions
  
  (deffoo nnimap-retrieve-groups (groups &optional server)
    (when (nnimap-possibly-change-server server)
      (gnus-message 5 "nnimap: Checking mailboxes...")
      (with-current-buffer nntp-server-buffer
        (erase-buffer)
        (nnimap-before-find-minmax-bugworkaround)
!       (dolist (group groups)
!       (gnus-message 7 "nnimap: Checking mailbox %s" group)
!       (or (member "\\NoSelect"
!                   (imap-mailbox-get 'list-flags group nnimap-server-buffer))
!           (let ((info (nnimap-find-minmax-uid group 'examine)))
!             (insert (format "\"%s\" %d %d y\n" group
!                             (or (nth 2 info) 0)
!                             (max 1 (or (nth 1 info) 1))))))))
      (gnus-message 5 "nnimap: Checking mailboxes...done")
      'active))
  
  (deffoo nnimap-request-update-info-internal (group info &optional server)
    (when (nnimap-possibly-change-group group server)
!     (when info;; xxx what does this mean? should we create a info?
        (with-current-buffer nnimap-server-buffer
        (gnus-message 5 "nnimap: Updating info for %s..."
                      (gnus-info-group info))
--- 998,1099 ----
  
  ;; Optional backend functions
  
+ (defun nnimap-string-lessp-numerical (s1 s2)
+   "Return t if first arg string is less than second in numerical order."
+   (cond ((string= s1 s2)
+        nil)
+       ((> (length s1) (length s2))
+        nil)
+       ((< (length s1) (length s2))
+        t)
+       ((< (string-to-number (substring s1 0 1))
+           (string-to-number (substring s2 0 1)))
+        t)
+       ((> (string-to-number (substring s1 0 1))
+           (string-to-number (substring s2 0 1)))
+        nil)
+       (t
+        (nnimap-string-lessp-numerical (substring s1 1) (substring s2 1)))))
+ 
  (deffoo nnimap-retrieve-groups (groups &optional server)
    (when (nnimap-possibly-change-server server)
      (gnus-message 5 "nnimap: Checking mailboxes...")
      (with-current-buffer nntp-server-buffer
        (erase-buffer)
        (nnimap-before-find-minmax-bugworkaround)
!       (let (asyncgroups slowgroups)
!       (if (null nnimap-retrieve-groups-asynchronous)
!           (setq slowgroups groups)
!         (dolist (group groups)
!           (gnus-message 9 "nnimap: Quickly checking mailbox %s" group)
!           (add-to-list (if (gnus-gethash-safe
!                             (gnus-group-prefixed-name group server)
!                             nnimap-mailbox-info)
!                            'asyncgroups
!                          'slowgroups)
!                        (list group (imap-mailbox-status-asynch
!                                     group '(uidvalidity uidnext unseen) 
!                                     nnimap-server-buffer))))
!         (dolist (asyncgroup asyncgroups)
!           (let ((group (nth 0 asyncgroup))
!                 (tag   (nth 1 asyncgroup))
!                 new old)
!             (when (imap-ok-p (imap-wait-for-tag tag nnimap-server-buffer))
!               (if (or (not (string=
!                             (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
!                                                   group server)
!                                                  nnimap-mailbox-info))
!                             (imap-mailbox-get 'uidnext group
!                                               nnimap-server-buffer))))
!                   (push (list group) slowgroups)
!                 (insert (nth 3 (gnus-gethash (gnus-group-prefixed-name
!                                               group server)
!                                              nnimap-mailbox-info))))))))
!       (dolist (group slowgroups)
!         (if nnimap-retrieve-groups-asynchronous
!             (setq group (car group)))
!         (gnus-message 7 "nnimap: Mailbox %s modified" group)
!         (imap-mailbox-put 'uidnext nil group nnimap-server-buffer)
!         (or (member "\\NoSelect" (imap-mailbox-get 'list-flags group
!                                                    nnimap-server-buffer))
!             (let* ((info (nnimap-find-minmax-uid group 'examine))
!                    (str (format "\"%s\" %d %d y\n" group
!                                 (or (nth 2 info) 0)
!                                 (max 1 (or (nth 1 info) 1)))))
!               (when (> (or (imap-mailbox-get 'recent group
!                                              nnimap-server-buffer) 0)
!                        0)
!                 (push (list (cons group 0)) nnmail-split-history))
!               (insert str)
!               (when nnimap-retrieve-groups-asynchronous
!                 (gnus-sethash
!                  (gnus-group-prefixed-name group server)
!                  (list (or (imap-mailbox-get
!                             'uidvalidity group nnimap-server-buffer)
!                            (imap-mailbox-status
!                             group 'uidvalidity nnimap-server-buffer))
!                        (or (imap-mailbox-get
!                             'uidnext group nnimap-server-buffer)
!                            (imap-mailbox-status
!                             group 'uidnext nnimap-server-buffer))
!                        (or (imap-mailbox-get
!                             'unseen group nnimap-server-buffer)
!                            (imap-mailbox-status
!                             group 'unseen nnimap-server-buffer))
!                        str)
!                  nnimap-mailbox-info)))))))
      (gnus-message 5 "nnimap: Checking mailboxes...done")
      'active))
  
  (deffoo nnimap-request-update-info-internal (group info &optional server)
    (when (nnimap-possibly-change-group group server)
!     (when info ;; xxx what does this mean? should we create a info?
        (with-current-buffer nnimap-server-buffer
        (gnus-message 5 "nnimap: Updating info for %s..."
                      (gnus-info-group info))
***************
*** 887,898 ****
            (gnus-info-set-read info seen)))
  
        (mapcar (lambda (pred)
!                 (when (and (nnimap-mark-permanent-p (cdr pred))
!                            (member (nnimap-mark-to-flag (cdr pred))
!                                    (imap-mailbox-get 'flags)))
                    (gnus-info-set-marks
                     info
!                    (nnimap-update-alist-soft
                      (cdr pred)
                      (gnus-compress-sequence
                       (imap-search (nnimap-mark-to-predicate (cdr pred))))
--- 1121,1133 ----
            (gnus-info-set-read info seen)))
  
        (mapcar (lambda (pred)
!                 (when (or (eq (cdr pred) 'recent)
!                           (and (nnimap-mark-permanent-p (cdr pred))
!                                (member (nnimap-mark-to-flag (cdr pred))
!                                        (imap-mailbox-get 'flags))))
                    (gnus-info-set-marks
                     info
!                    (gnus-update-alist-soft
                      (cdr pred)
                      (gnus-compress-sequence
                       (imap-search (nnimap-mark-to-predicate (cdr pred))))
***************
*** 900,916 ****
                     t)))
                gnus-article-mark-lists)
  
!       ;; 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
!          (cdr-safe (assoc 'tick (gnus-info-marks info)))
!          (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))
--- 1135,1152 ----
                     t)))
                gnus-article-mark-lists)
  
!       (when nnimap-importantize-dormant
!         ;; 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
!          (gnus-update-alist-soft
!           'tick
!           (gnus-remove-from-range
!            (cdr-safe (assoc 'tick (gnus-info-marks info)))
!            (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))
***************
*** 932,942 ****
                (what  (nth 1 action))
                (cmdmarks (nth 2 action))
                marks)
            ;; cache flags are pointless on the server
            (setq cmdmarks (delq 'cache cmdmarks))
!           ;; flag dormant articles as ticked
!           (if (memq 'dormant cmdmarks)
!               (setq cmdmarks (cons 'tick cmdmarks)))
            ;; remove stuff we are forbidden to store
            (mapcar (lambda (mark)
                      (if (imap-message-flag-permanent-p
--- 1168,1189 ----
                (what  (nth 1 action))
                (cmdmarks (nth 2 action))
                marks)
+           ;; bookmark can't be stored (not list/range
+           (setq cmdmarks (delq 'bookmark cmdmarks))
+           ;; killed can't be stored (not list/range
+           (setq cmdmarks (delq 'killed cmdmarks))
+           ;; unsent are for nndraft groups only
+           (setq cmdmarks (delq 'unsent cmdmarks))
            ;; cache flags are pointless on the server
            (setq cmdmarks (delq 'cache cmdmarks))
!           ;; seen flags are local to each gnus
!           (setq cmdmarks (delq 'seen cmdmarks))
!           ;; recent marks can't be set
!           (setq cmdmarks (delq 'recent cmdmarks))
!           (when nnimap-importantize-dormant
!             ;; flag dormant articles as ticked
!             (if (memq 'dormant cmdmarks)
!                 (setq cmdmarks (cons 'tick cmdmarks))))
            ;; remove stuff we are forbidden to store
            (mapcar (lambda (mark)
                      (if (imap-message-flag-permanent-p
***************
*** 960,966 ****
    nil)
  
  (defun nnimap-split-fancy ()
!   "Like nnmail-split-fancy, but uses nnimap-split-fancy."
    (let ((nnmail-split-fancy nnimap-split-fancy))
      (nnmail-split-fancy)))
  
--- 1207,1213 ----
    nil)
  
  (defun nnimap-split-fancy ()
!   "Like the function `nnmail-split-fancy', but uses `nnimap-split-fancy'."
    (let ((nnmail-split-fancy nnimap-split-fancy))
      (nnmail-split-fancy)))
  
***************
*** 982,988 ****
              (goto-char (point-min))
              (when (and (if (stringp regexp)
                             (progn
!                              (setq regrepp (string-match "\\\\[0-9&]" group))
                               (re-search-forward regexp nil t))
                           (funcall regexp group))
                         ;; Don't enter the article into the same group twice.
--- 1229,1238 ----
              (goto-char (point-min))
              (when (and (if (stringp regexp)
                             (progn
!                              (if (not (stringp group))
!                                  (setq group (eval group))
!                                (setq regrepp
!                                      (string-match "\\\\[0-9&]" group)))
                               (re-search-forward regexp nil t))
                           (funcall regexp group))
                         ;; Don't enter the article into the same group twice.
***************
*** 1004,1010 ****
  
  (defun nnimap-split-find-rule (server inbox)
    (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))))
--- 1254,1260 ----
  
  (defun nnimap-split-find-rule (server inbox)
    (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))))
***************
*** 1021,1053 ****
        (let (rule inbox removeorig (inboxes (nnimap-split-find-inbox server)))
        ;; iterate over inboxes
        (while (and (setq inbox (pop inboxes))
!                   (nnimap-possibly-change-group inbox));; SELECT
          ;; find split rule for this server / inbox
          (when (setq rule (nnimap-split-find-rule server inbox))
            ;; iterate over articles
            (dolist (article (imap-search nnimap-split-predicate))
!             (when (nnimap-request-head article)
                ;; copy article to right group(s)
                (setq removeorig nil)
                (dolist (to-group (nnimap-split-to-groups rule))
!                 (if (imap-message-copy (number-to-string article)
!                                        to-group nil 'nocopyuid)
!                     (progn
!                       (message "IMAP split moved %s:%s:%d to %s" server inbox
!                                article to-group)
!                       (setq removeorig t)
!                       ;; Add the group-art list to the history list.
!                       (push (list (cons to-group 0)) nnmail-split-history))
!                   (message "IMAP split failed to move %s:%s:%d to %s" server
!                            inbox article to-group)))
                ;; remove article if it was successfully copied somewhere
                (and removeorig
                     (imap-message-flags-add (format "%d" article)
                                             "\\Seen \\Deleted")))))
!         (when (imap-mailbox-select inbox);; just in case
            ;; todo: UID EXPUNGE (if available) to remove splitted articles
            (imap-mailbox-expunge)
            (imap-mailbox-close)))
        t))))
  
  (deffoo nnimap-request-scan (&optional group server)
--- 1271,1326 ----
        (let (rule inbox removeorig (inboxes (nnimap-split-find-inbox server)))
        ;; iterate over inboxes
        (while (and (setq inbox (pop inboxes))
!                   (nnimap-possibly-change-group inbox)) ;; SELECT
          ;; find split rule for this server / inbox
          (when (setq rule (nnimap-split-find-rule server inbox))
            ;; iterate over articles
            (dolist (article (imap-search nnimap-split-predicate))
!             (when (if (if (eq nnimap-split-download-body 'default)
!                           nnimap-split-download-body-default
!                         nnimap-split-download-body)
!                       (and (nnimap-request-article article)
!                            (with-current-buffer nntp-server-buffer 
(mail-narrow-to-head)))
!                     (nnimap-request-head article))
                ;; copy article to right group(s)
                (setq removeorig nil)
                (dolist (to-group (nnimap-split-to-groups rule))
!                 (cond ((eq to-group 'junk)
!                        (message "IMAP split removed %s:%s:%d" server inbox
!                                 article)
!                        (setq removeorig t))
!                       ((imap-message-copy (number-to-string article)
!                                           to-group nil 'nocopyuid)
!                        (message "IMAP split moved %s:%s:%d to %s" server
!                                 inbox article to-group)
!                        (setq removeorig t)
!                        (when nnmail-cache-accepted-message-ids
!                          (with-current-buffer nntp-server-buffer
!                            (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.
!                        (push (list (cons to-group 0)) nnmail-split-history))
!                       (t
!                        (message "IMAP split failed to move %s:%s:%d to %s"
!                                 server inbox article to-group))))
!               (if (if (eq nnimap-split-download-body 'default)
!                       nnimap-split-download-body-default
!                     nnimap-split-download-body)
!                   (widen))
                ;; remove article if it was successfully copied somewhere
                (and removeorig
                     (imap-message-flags-add (format "%d" article)
                                             "\\Seen \\Deleted")))))
!         (when (imap-mailbox-select inbox) ;; just in case
            ;; todo: UID EXPUNGE (if available) to remove splitted articles
            (imap-mailbox-expunge)
            (imap-mailbox-close)))
+       (when nnmail-cache-accepted-message-ids
+         (nnmail-cache-close))
        t))))
  
  (deffoo nnimap-request-scan (&optional group server)
***************
*** 1062,1068 ****
        (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
--- 1335,1341 ----
        (nnimap-before-find-minmax-bugworkaround)
        (dolist (pattern (nnimap-pattern-to-list-arguments
                        nnimap-list-pattern))
!       (dolist (mbx (imap-mailbox-lsub (cdr pattern) (car pattern) nil
                                        nnimap-server-buffer))
          (or (catch 'found
                (dolist (mailbox (imap-mailbox-get 'list-flags mbx
***************
*** 1072,1080 ****
                nil)
              (let ((info (nnimap-find-minmax-uid mbx 'examine)))
                (when info
!                  (insert (format "\"%s\" %d %d y\n"
!                                  mbx (or (nth 2 info) 0)
!                                (max 1 (or (nth 1 info) 1)))))))))
        (gnus-message 5 "nnimap: Listing subscribed mailboxes%s%s...done"
                    (if (> (length server) 0) " on " "") server))
      t))
--- 1345,1353 ----
                nil)
              (let ((info (nnimap-find-minmax-uid mbx 'examine)))
                (when info
!                 (insert (format "\"%s\" %d %d y\n"
!                                 mbx (or (nth 2 info) 0)
!                                 (max 1 (or (nth 1 info) 1)))))))))
        (gnus-message 5 "nnimap: Listing subscribed mailboxes%s%s...done"
                    (if (> (length server) 0) " on " "") server))
      t))
***************
*** 1082,1088 ****
  (deffoo nnimap-request-create-group (group &optional server args)
    (when (nnimap-possibly-change-server server)
      (or (imap-mailbox-status group 'uidvalidity nnimap-server-buffer)
!       (imap-mailbox-create group nnimap-server-buffer))))
  
  (defun nnimap-time-substract (time1 time2)
    "Return TIME for TIME1 - TIME2."
--- 1355,1363 ----
  (deffoo nnimap-request-create-group (group &optional server args)
    (when (nnimap-possibly-change-server server)
      (or (imap-mailbox-status group 'uidvalidity nnimap-server-buffer)
!       (imap-mailbox-create group nnimap-server-buffer)
!       (nnheader-report 'nnimap "%S"
!                        (imap-error-text nnimap-server-buffer)))))
  
  (defun nnimap-time-substract (time1 time2)
    "Return TIME for TIME1 - TIME2."
***************
*** 1108,1143 ****
    (gnus-message 5 "nnimap: Marking article %d for deletion..."
                imap-current-message))
  
  ;; Notice that we don't actually delete anything, we just mark them deleted.
  (deffoo nnimap-request-expire-articles (articles group &optional server force)
    (let ((artseq (gnus-compress-sequence articles)))
      (when (and artseq (nnimap-possibly-change-group group server))
        (with-current-buffer nnimap-server-buffer
!       (if force
!           (and (imap-message-flags-add
!                 (imap-range-to-message-set artseq) "\\Deleted")
!                (setq articles nil))
!         (let ((days (or (and nnmail-expiry-wait-function
!                              (funcall nnmail-expiry-wait-function group))
!                         nnmail-expiry-wait)))
!           (cond ((eq days 'immediate)
!                  (and (imap-message-flags-add
!                        (imap-range-to-message-set artseq) "\\Deleted")
!                       (setq articles nil)))
!                 ((numberp days)
!                  (let ((oldarts (imap-search
!                                  (format "UID %s NOT SINCE %s"
!                                          (imap-range-to-message-set artseq)
!                                          (nnimap-date-days-ago days))))
!                        (imap-fetch-data-hook
!                         '(nnimap-request-expire-articles-progress)))
!                    (and oldarts
!                         (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)
  
--- 1383,1435 ----
    (gnus-message 5 "nnimap: Marking article %d for deletion..."
                imap-current-message))
  
+ (defun nnimap-expiry-target (arts group server)
+   (unless (eq nnmail-expiry-target 'delete)
+     (with-temp-buffer
+       (dolist (art arts)
+       (nnimap-request-article art group server (current-buffer))
+       ;; hints for optimization in `nnimap-request-accept-article'
+       (let ((nnimap-current-move-article art)
+             (nnimap-current-move-group group)
+             (nnimap-current-move-server server))
+         (nnmail-expiry-target-group nnmail-expiry-target group))))
+     ;; It is not clear if `nnmail-expiry-target' somehow cause the
+     ;; current group to be changed or not, so we make sure here.
+     (nnimap-possibly-change-group group server)))
+ 
  ;; Notice that we don't actually delete anything, we just mark them deleted.
  (deffoo nnimap-request-expire-articles (articles group &optional server force)
    (let ((artseq (gnus-compress-sequence articles)))
      (when (and artseq (nnimap-possibly-change-group group server))
        (with-current-buffer nnimap-server-buffer
!       (let ((days (or (and nnmail-expiry-wait-function
!                            (funcall nnmail-expiry-wait-function group))
!                       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))))))
!               ((numberp days)
!                (let ((oldarts (imap-search
!                                (format nnimap-expunge-search-string
!                                        (imap-range-to-message-set artseq)
!                                        (nnimap-date-days-ago days))))
!                      (imap-fetch-data-hook
!                       '(nnimap-request-expire-articles-progress)))
!                  (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)
  
***************
*** 1158,1164 ****
               (setq result (eval accept-form))
               (kill-buffer buf)
               result)
!            (nnimap-request-expire-articles (list article) group server t))
        result))))
  
  (deffoo nnimap-request-accept-article (group &optional server last)
--- 1450,1458 ----
               (setq result (eval accept-form))
               (kill-buffer buf)
               result)
!            (imap-message-flags-add
!             (imap-range-to-message-set (list article))
!             "\\Deleted" 'silent nnimap-server-buffer))
        result))))
  
  (deffoo nnimap-request-accept-article (group &optional server last)
***************
*** 1178,1190 ****
                    ;; remove any 'From blabla' lines, some IMAP servers
                    ;; reject the entire message otherwise.
                    (when (looking-at "^From[^:]")
!                     (kill-region (point) (progn (forward-line) (point))))
                    ;; turn into rfc822 format (\r\n eol's)
                    (while (search-forward "\n" nil t)
!                     (replace-match "\r\n")))
!                   ;; this 'or' is for Cyrus server bug
!                   (or (null (imap-current-mailbox nnimap-server-buffer))
!                       (imap-mailbox-unselect nnimap-server-buffer))
                  (imap-message-append group (current-buffer) nil nil
                                       nnimap-server-buffer)))
          (cons group (nth 1 uid))
--- 1472,1490 ----
                    ;; remove any 'From blabla' lines, some IMAP servers
                    ;; reject the entire message otherwise.
                    (when (looking-at "^From[^:]")
!                     (delete-region (point) (progn (forward-line) (point))))
                    ;; turn into rfc822 format (\r\n eol's)
                    (while (search-forward "\n" nil t)
!                     (replace-match "\r\n"))
!                   (when nnmail-cache-accepted-message-ids
!                     (nnmail-cache-insert (nnmail-fetch-field "message-id")
!                                          group
!                                          (nnmail-fetch-field "subject"))))
!                 (when (and last nnmail-cache-accepted-message-ids)
!                   (nnmail-cache-close))
!                 ;; this 'or' is for Cyrus server bug
!                 (or (null (imap-current-mailbox nnimap-server-buffer))
!                     (imap-mailbox-unselect nnimap-server-buffer))
                  (imap-message-append group (current-buffer) nil nil
                                       nnimap-server-buffer)))
          (cons group (nth 1 uid))
***************
*** 1205,1211 ****
  
  (defun nnimap-expunge (mailbox server)
    (when (nnimap-possibly-change-group mailbox server)
!     (imap-mailbox-expunge nnimap-server-buffer)))
  
  (defun nnimap-acl-get (mailbox server)
    (when (nnimap-possibly-change-server server)
--- 1505,1511 ----
  
  (defun nnimap-expunge (mailbox server)
    (when (nnimap-possibly-change-group mailbox server)
!     (imap-mailbox-expunge nil nnimap-server-buffer)))
  
  (defun nnimap-acl-get (mailbox server)
    (when (nnimap-possibly-change-server server)
***************
*** 1253,1264 ****
    (mapcar
     (lambda (pair)                     ; cdr is the mark
       (or (assoc (cdr pair)
!                 '((read . "SEEN")
!                   (tick . "FLAGGED")
!                   (draft . "DRAFT")
!                   (reply . "ANSWERED")))
!          (cons (cdr pair)
!                (format "KEYWORD gnus-%s" (symbol-name (cdr pair))))))
     (cons '(read . read) gnus-article-mark-lists)))
  
  (defun nnimap-mark-to-predicate (pred)
--- 1553,1565 ----
    (mapcar
     (lambda (pair)                     ; cdr is the mark
       (or (assoc (cdr pair)
!               '((read . "SEEN")
!                 (tick . "FLAGGED")
!                 (draft . "DRAFT")
!                 (recent . "RECENT")
!                 (reply . "ANSWERED")))
!        (cons (cdr pair)
!              (format "KEYWORD gnus-%s" (symbol-name (cdr pair))))))
     (cons '(read . read) gnus-article-mark-lists)))
  
  (defun nnimap-mark-to-predicate (pred)
***************
*** 1271,1282 ****
    (mapcar
     (lambda (pair)
       (or (assoc (cdr pair)
!                 '((read . "\\Seen")
!                   (tick . "\\Flagged")
!                   (draft . "\\Draft")
!                   (reply . "\\Answered")))
!          (cons (cdr pair)
!                (format "gnus-%s" (symbol-name (cdr pair))))))
     (cons '(read . read) gnus-article-mark-lists)))
  
  (defun nnimap-mark-to-flag-1 (preds)
--- 1572,1584 ----
    (mapcar
     (lambda (pair)
       (or (assoc (cdr pair)
!               '((read . "\\Seen")
!                 (tick . "\\Flagged")
!                 (draft . "\\Draft")
!                 (recent . "\\Recent")
!                 (reply . "\\Answered")))
!        (cons (cdr pair)
!              (format "gnus-%s" (symbol-name (cdr pair))))))
     (cons '(read . read) gnus-article-mark-lists)))
  
  (defun nnimap-mark-to-flag-1 (preds)
***************
*** 1306,1391 ****
    "Return t iff MARK can be permanently (between IMAP sessions) saved on 
articles, in GROUP."
    (imap-message-flag-permanent-p (nnimap-mark-to-flag mark)))
  
- (defun nnimap-remassoc (key alist)
-   "Delete by side effect any elements of LIST whose car is `equal' to KEY.
- The modified LIST is returned.  If the first member
- of LIST has a car that is `equal' to KEY, there is no way to remove it
- by side effect; therefore, write `(setq foo (remassoc key foo))' to be
- sure of changing the value of `foo'."
-   (when alist
-     (if (equal key (caar alist))
-       (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))
-     (nnimap-remassoc key alist)))
- 
  (when nnimap-debug
    (require 'trace)
!   (buffer-disable-undo (get-buffer-create nnimap-debug))
!   (mapcar (lambda (f) (trace-function-background f nnimap-debug))
!         '(
!         nnimap-possibly-change-server
!         nnimap-verify-uidvalidity
!         nnimap-find-minmax-uid
!         nnimap-before-find-minmax-bugworkaround
!         nnimap-possibly-change-group
!         ;;nnimap-replace-whitespace
!         nnimap-retrieve-headers-progress
!         nnimap-retrieve-which-headers
!         nnimap-group-overview-filename
!         nnimap-retrieve-headers-from-file
!         nnimap-retrieve-headers-from-server
!         nnimap-retrieve-headers
!         nnimap-open-connection
!         nnimap-open-server
!         nnimap-server-opened
!         nnimap-close-server
!         nnimap-request-close
!         nnimap-status-message
!         ;;nnimap-demule
!         nnimap-request-article-part
!         nnimap-request-article
!         nnimap-request-head
!         nnimap-request-body
!         nnimap-request-group
!         nnimap-close-group
!         nnimap-pattern-to-list-arguments
!         nnimap-request-list
!         nnimap-request-post
!         nnimap-retrieve-groups
!         nnimap-request-update-info-internal
!         nnimap-request-type
!         nnimap-request-set-mark
!         nnimap-split-to-groups
!         nnimap-split-find-rule
!         nnimap-split-find-inbox
!         nnimap-split-articles
!         nnimap-request-scan
!         nnimap-request-newgroups
!         nnimap-request-create-group
!         nnimap-time-substract
!         nnimap-date-days-ago
!         nnimap-request-expire-articles-progress
!         nnimap-request-expire-articles
!         nnimap-request-move-article
!         nnimap-request-accept-article
!         nnimap-request-delete-group
!         nnimap-request-rename-group
!         gnus-group-nnimap-expunge
!         gnus-group-nnimap-edit-acl
!         gnus-group-nnimap-edit-acl-done
!         nnimap-group-mode-hook
!         nnimap-mark-to-predicate
!         nnimap-mark-to-flag-1
!         nnimap-mark-to-flag
!         nnimap-mark-permanent-p
!         nnimap-remassoc
!         nnimap-update-alist-soft
!           )))
  
  (provide 'nnimap)
  
--- 1608,1674 ----
    "Return t iff MARK can be permanently (between IMAP sessions) saved on 
articles, in GROUP."
    (imap-message-flag-permanent-p (nnimap-mark-to-flag mark)))
  
  (when nnimap-debug
    (require 'trace)
!   (buffer-disable-undo (get-buffer-create nnimap-debug-buffer))
!   (mapcar (lambda (f) (trace-function-background f nnimap-debug-buffer))
!         '(
!           nnimap-possibly-change-server
!           nnimap-verify-uidvalidity
!           nnimap-find-minmax-uid
!           nnimap-before-find-minmax-bugworkaround
!           nnimap-possibly-change-group
!           ;;nnimap-replace-whitespace
!           nnimap-retrieve-headers-progress
!           nnimap-retrieve-which-headers
!           nnimap-group-overview-filename
!           nnimap-retrieve-headers-from-file
!           nnimap-retrieve-headers-from-server
!           nnimap-retrieve-headers
!           nnimap-open-connection
!           nnimap-open-server
!           nnimap-server-opened
!           nnimap-close-server
!           nnimap-request-close
!           nnimap-status-message
!           ;;nnimap-demule
!           nnimap-request-article-part
!           nnimap-request-article
!           nnimap-request-head
!           nnimap-request-body
!           nnimap-request-group
!           nnimap-close-group
!           nnimap-pattern-to-list-arguments
!           nnimap-request-list
!           nnimap-request-post
!           nnimap-retrieve-groups
!           nnimap-request-update-info-internal
!           nnimap-request-type
!           nnimap-request-set-mark
!           nnimap-split-to-groups
!           nnimap-split-find-rule
!           nnimap-split-find-inbox
!           nnimap-split-articles
!           nnimap-request-scan
!           nnimap-request-newgroups
!           nnimap-request-create-group
!           nnimap-time-substract
!           nnimap-date-days-ago
!           nnimap-request-expire-articles-progress
!           nnimap-request-expire-articles
!           nnimap-request-move-article
!           nnimap-request-accept-article
!           nnimap-request-delete-group
!           nnimap-request-rename-group
!           gnus-group-nnimap-expunge
!           gnus-group-nnimap-edit-acl
!           gnus-group-nnimap-edit-acl-done
!           nnimap-group-mode-hook
!           nnimap-mark-to-predicate
!           nnimap-mark-to-flag-1
!           nnimap-mark-to-flag
!           nnimap-mark-permanent-p
!           )))
  
  (provide 'nnimap)
  




reply via email to

[Prev in Thread] Current Thread [Next in Thread]