diff options
Diffstat (limited to 'lisp/gnus/nnimap.el')
| -rw-r--r-- | lisp/gnus/nnimap.el | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 6a57941f404..145fd994364 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -369,7 +369,7 @@ If EXAMINE is non-nil the group is selected read-only." 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,7 +598,7 @@ If EXAMINE is non-nil the group is selected read-only." (port (if nnimap-server-port (int-to-string nnimap-server-port) "imap")) - (alist (gnus-netrc-machine list (or nnimap-server-address + (alist (gnus-netrc-machine list (or nnimap-server-address nnimap-address server) port "imap")) (user (gnus-netrc-get alist "login")) @@ -683,7 +683,7 @@ function is generally only called when Gnus is shutting down." (insert (with-current-buffer nnimap-server-buffer (nnimap-demule - (if (imap-capability 'IMAP4rev1) + (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,7 +857,7 @@ function is generally only called when Gnus is shutting down." (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,7 +897,7 @@ function is generally only called when Gnus is shutting down." ;; 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 + info (nnimap-update-alist-soft 'tick (gnus-remove-from-range @@ -905,7 +905,7 @@ function is generally only called when Gnus is shutting down." (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,7 +987,7 @@ function is generally only called when Gnus is shutting down." 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,7 +1000,7 @@ function is generally only called when Gnus is shutting down." (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 + (cadr (nnimap-assoc-match inbox (cdr (nnimap-assoc-match server nnimap-split-rule)))) nnimap-split-rule)) @@ -1056,7 +1056,7 @@ function is generally only called when Gnus is shutting down." (nnimap-before-find-minmax-bugworkaround) (dolist (pattern (nnimap-pattern-to-list-arguments nnimap-list-pattern)) - (dolist (mbx (imap-mailbox-lsub "*" (car pattern) nil + (dolist (mbx (imap-mailbox-lsub "*" (car pattern) nil nnimap-server-buffer)) (or (catch 'found (dolist (mailbox (imap-mailbox-get 'list-flags mbx @@ -1072,7 +1072,7 @@ function is generally only called when Gnus is shutting down." (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,7 +1154,7 @@ function is generally only called when Gnus is shutting down." 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,7 +1311,7 @@ sure of changing the value of `foo'." (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)) |