Mercurial > emacs
annotate lisp/gnus/nnimap.el @ 110957:627742e646c4
Merge changes made in Gnus trunk.
gnus-gravatar.el (gnus-art): Required.
shr.el (shr-tag-img): Add align attribute support for <img>.
gnus-gravatar.el (gnus-gravatar-insert): Check if buffer is alive.
shr.el (shr-tag-img): Encode URL properly when retrieving.
shr.el (shr-get-image-data): Encode URL properly when fetching from cache.
shr.el (shr-tag-img): Use aligned-to spaces to align correctly images.
nnimap.el (nnimap-request-rename-group): Unselect by selecting a mailbox that doesn't exist.
rfc2231.el (rfc2231-parse-string): Ignore repeated parts.
gnus-gravatar.el (gnus-gravatar-too-ugly): Don't test if gnus-article-x-face-too-ugly is bound.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Tue, 12 Oct 2010 22:18:24 +0000 |
parents | 236342431786 |
children | 3958dbde1223 |
rev | line source |
---|---|
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1 ;;; nnimap.el --- IMAP interface for Gnus |
64754
fafd692d1e40
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64085
diff
changeset
|
2 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
3 ;; Copyright (C) 2010 Free Software Foundation, Inc. |
31717 | 4 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
5 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
6 ;; Simon Josefsson <simon@josefsson.org> |
31717 | 7 |
8 ;; This file is part of GNU Emacs. | |
9 | |
94662
f42ef85caf91
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93820
diff
changeset
|
10 ;; GNU Emacs is free software: you can redistribute it and/or modify |
31717 | 11 ;; it under the terms of the GNU General Public License as published by |
94662
f42ef85caf91
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93820
diff
changeset
|
12 ;; the Free Software Foundation, either version 3 of the License, or |
f42ef85caf91
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93820
diff
changeset
|
13 ;; (at your option) any later version. |
31717 | 14 |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
94662
f42ef85caf91
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93820
diff
changeset
|
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
31717 | 18 ;; GNU General Public License for more details. |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
94662
f42ef85caf91
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93820
diff
changeset
|
21 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
31717 | 22 |
23 ;;; Commentary: | |
24 | |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
25 ;; nnimap interfaces Gnus with IMAP servers. |
31717 | 26 |
27 ;;; Code: | |
28 | |
110918
236342431786
nnimap.el (gnutls-negotiate): Silence the byte compiler.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110917
diff
changeset
|
29 ;; For Emacs <22.2 and XEmacs. |
236342431786
nnimap.el (gnutls-negotiate): Silence the byte compiler.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110917
diff
changeset
|
30 (eval-and-compile |
236342431786
nnimap.el (gnutls-negotiate): Silence the byte compiler.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110917
diff
changeset
|
31 (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))) |
236342431786
nnimap.el (gnutls-negotiate): Silence the byte compiler.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110917
diff
changeset
|
32 |
107427
ecbe0edc4f69
Stop message.el from loading about 40 libraries it doesn't always need.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
33 (eval-and-compile |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
34 (require 'nnheader)) |
107427
ecbe0edc4f69
Stop message.el from loading about 40 libraries it doesn't always need.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
35 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
36 (eval-when-compile |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
37 (require 'cl)) |
31717 | 38 |
110419
bde55f3d7125
* nnimap.el: Require nnoo and other files necessary.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110410
diff
changeset
|
39 (require 'nnheader) |
bde55f3d7125
* nnimap.el: Require nnoo and other files necessary.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110410
diff
changeset
|
40 (require 'gnus-util) |
bde55f3d7125
* nnimap.el: Require nnoo and other files necessary.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110410
diff
changeset
|
41 (require 'gnus) |
bde55f3d7125
* nnimap.el: Require nnoo and other files necessary.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110410
diff
changeset
|
42 (require 'nnoo) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
43 (require 'netrc) |
110605
5bd3c6bdbcb0
nnimap.el (utf7): Required.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110604
diff
changeset
|
44 (require 'utf7) |
110666
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
45 (require 'tls) |
110465
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
46 (require 'parse-time) |
94837 | 47 |
110633
b1c50a3d738a
nnimap.el (auth-source-forget-user-or-password, auth-source-user-or-password): Autoload.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110615
diff
changeset
|
48 (autoload 'auth-source-forget-user-or-password "auth-source") |
b1c50a3d738a
nnimap.el (auth-source-forget-user-or-password, auth-source-user-or-password): Autoload.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110615
diff
changeset
|
49 (autoload 'auth-source-user-or-password "auth-source") |
b1c50a3d738a
nnimap.el (auth-source-forget-user-or-password, auth-source-user-or-password): Autoload.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110615
diff
changeset
|
50 |
31717 | 51 (nnoo-declare nnimap) |
52 | |
53 (defvoo nnimap-address nil | |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
54 "The address of the IMAP server.") |
31717 | 55 |
56 (defvoo nnimap-server-port nil | |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
57 "The IMAP port used. |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
58 If nnimap-stream is `ssl', this will default to `imaps'. If not, |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
59 it will default to `imap'.") |
31717 | 60 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
61 (defvoo nnimap-stream 'ssl |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
62 "How nnimap will talk to the IMAP server. |
110516
4d2f8b81bb01
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110502
diff
changeset
|
63 Values are `ssl', `network', `starttls' or `shell'.") |
31717 | 64 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
65 (defvoo nnimap-shell-program (if (boundp 'imap-shell-program) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
66 (if (listp imap-shell-program) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
67 (car imap-shell-program) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
68 imap-shell-program) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
69 "ssh %s imapd")) |
31717 | 70 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
71 (defvoo nnimap-inbox nil |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
72 "The mail box where incoming mail arrives and should be split out of.") |
31717 | 73 |
110583
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
74 (defvoo nnimap-split-methods nil |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
75 "How mail is split. |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
76 Uses the same syntax as nnmail-split-methods") |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
77 |
110666
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
78 (defvoo nnimap-split-fancy nil |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
79 "Uses the same syntax as nnmail-split-fancy.") |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
80 |
110661
2b8ece636433
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110633
diff
changeset
|
81 (make-obsolete-variable 'nnimap-split-rule "see `nnimap-split-methods'" |
110666
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
82 "Emacs 24.1") |
110661
2b8ece636433
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110633
diff
changeset
|
83 |
110433
33cf78a271ef
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110428
diff
changeset
|
84 (defvoo nnimap-authenticator nil |
33cf78a271ef
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110428
diff
changeset
|
85 "How nnimap authenticate itself to the server. |
33cf78a271ef
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110428
diff
changeset
|
86 Possible choices are nil (use default methods) or `anonymous'.") |
33cf78a271ef
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110428
diff
changeset
|
87 |
110486
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
88 (defvoo nnimap-expunge t |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
89 "If non-nil, expunge articles after deleting them. |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
90 This is always done if the server supports UID EXPUNGE, but it's |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
91 not done by default on servers that doesn't support that command.") |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
92 |
110583
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
93 (defvoo nnimap-streaming t |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
94 "If non-nil, try to use streaming commands with IMAP servers. |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
95 Switching this off will make nnimap slower, but it helps with |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
96 some servers.") |
110465
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
97 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
98 (defvoo nnimap-connection-alist nil) |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
99 |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
100 (defvoo nnimap-current-infos nil) |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
101 |
110615
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
102 (defvoo nnimap-fetch-partial-articles nil |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
103 "If non-nil, Gnus will fetch partial articles. |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
104 If t, nnimap will fetch only the first part. If a string, it |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
105 will fetch all parts that have types that match that string. A |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
106 likely value would be \"text/\" to automatically fetch all |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
107 textual parts.") |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
108 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
109 (defvar nnimap-process nil) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56280
diff
changeset
|
110 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
111 (defvar nnimap-status-string "") |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56280
diff
changeset
|
112 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56280
diff
changeset
|
113 (defvar nnimap-split-download-body-default nil |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56280
diff
changeset
|
114 "Internal variable with default value for `nnimap-split-download-body'.") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56280
diff
changeset
|
115 |
110555
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
116 (defvar nnimap-keepalive-timer nil) |
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
117 (defvar nnimap-process-buffers nil) |
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
118 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
119 (defstruct nnimap |
110555
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
120 group process commands capabilities select-result newlinep server |
110596
415e87a42437
mail-source.el (mail-source-value): Revert previous patch.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110587
diff
changeset
|
121 last-command-time greeting) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56280
diff
changeset
|
122 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
123 (defvar nnimap-object nil) |
31717 | 124 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
125 (defvar nnimap-mark-alist |
110486
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
126 '((read "\\Seen" %Seen) |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
127 (tick "\\Flagged" %Flagged) |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
128 (reply "\\Answered" %Answered) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
129 (expire "gnus-expire") |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
130 (dormant "gnus-dormant") |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
131 (score "gnus-score") |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
132 (save "gnus-save") |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
133 (download "gnus-download") |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
134 (forward "gnus-forward"))) |
31717 | 135 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
136 (defun nnimap-buffer () |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
137 (nnimap-find-process-buffer nntp-server-buffer)) |
31717 | 138 |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
139 (deffoo nnimap-retrieve-headers (articles &optional group server fetch-old) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
140 (with-current-buffer nntp-server-buffer |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
141 (erase-buffer) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
142 (when (nnimap-possibly-change-group group server) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
143 (with-current-buffer (nnimap-buffer) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
144 (erase-buffer) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
145 (nnimap-wait-for-response |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
146 (nnimap-send-command |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
147 "UID FETCH %s %s" |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
148 (nnimap-article-ranges (gnus-compress-sequence articles)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
149 (format "(UID RFC822.SIZE BODYSTRUCTURE %s)" |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
150 (format |
110583
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
151 (if (nnimap-ver4-p) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
152 "BODY.PEEK[HEADER.FIELDS %s]" |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
153 "RFC822.HEADER.LINES %s") |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
154 (append '(Subject From Date Message-Id |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
155 References In-Reply-To Xref) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
156 nnmail-extra-headers)))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
157 t) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
158 (nnimap-transform-headers)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
159 (insert-buffer-substring |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
160 (nnimap-find-process-buffer (current-buffer)))) |
110516
4d2f8b81bb01
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110502
diff
changeset
|
161 'headers)) |
31717 | 162 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
163 (defun nnimap-transform-headers () |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
164 (goto-char (point-min)) |
110516
4d2f8b81bb01
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110502
diff
changeset
|
165 (let (article bytes lines size string) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
166 (block nil |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
167 (while (not (eobp)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
168 (while (not (looking-at "^\\* [0-9]+ FETCH.*UID \\([0-9]+\\)")) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
169 (delete-region (point) (progn (forward-line 1) (point))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
170 (when (eobp) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
171 (return))) |
110516
4d2f8b81bb01
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110502
diff
changeset
|
172 (setq article (match-string 1)) |
4d2f8b81bb01
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110502
diff
changeset
|
173 ;; Unfold quoted {number} strings. |
4d2f8b81bb01
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110502
diff
changeset
|
174 (while (re-search-forward "[^]] {\\([0-9]+\\)}\r\n" |
4d2f8b81bb01
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110502
diff
changeset
|
175 (1+ (line-end-position)) t) |
4d2f8b81bb01
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110502
diff
changeset
|
176 (setq size (string-to-number (match-string 1))) |
4d2f8b81bb01
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110502
diff
changeset
|
177 (delete-region (+ (match-beginning 0) 2) (point)) |
4d2f8b81bb01
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110502
diff
changeset
|
178 (setq string (delete-region (point) (+ (point) size))) |
4d2f8b81bb01
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110502
diff
changeset
|
179 (insert (format "%S" string))) |
4d2f8b81bb01
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110502
diff
changeset
|
180 (setq bytes (nnimap-get-length) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
181 lines nil) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
182 (beginning-of-line) |
110451
4b82113fd203
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110433
diff
changeset
|
183 (setq size |
4b82113fd203
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110433
diff
changeset
|
184 (and (re-search-forward "RFC822.SIZE \\([0-9]+\\)" |
4b82113fd203
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110433
diff
changeset
|
185 (line-end-position) |
4b82113fd203
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110433
diff
changeset
|
186 t) |
4b82113fd203
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110433
diff
changeset
|
187 (match-string 1))) |
4b82113fd203
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110433
diff
changeset
|
188 (beginning-of-line) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
189 (when (search-forward "BODYSTRUCTURE" (line-end-position) t) |
110516
4d2f8b81bb01
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110502
diff
changeset
|
190 (let ((structure (ignore-errors |
4d2f8b81bb01
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110502
diff
changeset
|
191 (read (current-buffer))))) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
192 (while (and (consp structure) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
193 (not (stringp (car structure)))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
194 (setq structure (car structure))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
195 (setq lines (nth 7 structure)))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
196 (delete-region (line-beginning-position) (line-end-position)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
197 (insert (format "211 %s Article retrieved." article)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
198 (forward-line 1) |
110451
4b82113fd203
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110433
diff
changeset
|
199 (when size |
4b82113fd203
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110433
diff
changeset
|
200 (insert (format "Chars: %s\n" size))) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
201 (when lines |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
202 (insert (format "Lines: %s\n" lines))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
203 (re-search-forward "^\r$") |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
204 (delete-region (line-beginning-position) (line-end-position)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
205 (insert ".") |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
206 (forward-line 1))))) |
31717 | 207 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
208 (defun nnimap-get-length () |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
209 (and (re-search-forward "{\\([0-9]+\\)}" (line-end-position) t) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
210 (string-to-number (match-string 1)))) |
31717 | 211 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
212 (defun nnimap-article-ranges (ranges) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
213 (let (result) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
214 (cond |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
215 ((numberp ranges) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
216 (number-to-string ranges)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
217 ((numberp (cdr ranges)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
218 (format "%d:%d" (car ranges) (cdr ranges))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
219 (t |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
220 (dolist (elem ranges) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
221 (push |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
222 (if (consp elem) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
223 (format "%d:%d" (car elem) (cdr elem)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
224 (number-to-string elem)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
225 result)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
226 (mapconcat #'identity (nreverse result) ","))))) |
107427
ecbe0edc4f69
Stop message.el from loading about 40 libraries it doesn't always need.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
227 |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
228 (deffoo nnimap-open-server (server &optional defs) |
31717 | 229 (if (nnimap-server-opened server) |
230 t | |
231 (unless (assq 'nnimap-address defs) | |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
232 (setq defs (append defs (list (list 'nnimap-address server))))) |
31717 | 233 (nnoo-change-server 'nnimap server defs) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
234 (or (nnimap-find-connection nntp-server-buffer) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
235 (nnimap-open-connection nntp-server-buffer)))) |
31717 | 236 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
237 (defun nnimap-make-process-buffer (buffer) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
238 (with-current-buffer |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
239 (generate-new-buffer (format "*nnimap %s %s %s*" |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
240 nnimap-address nnimap-server-port |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
241 (gnus-buffer-exists-p buffer))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
242 (mm-disable-multibyte) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
243 (buffer-disable-undo) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
244 (gnus-add-buffer) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
245 (set (make-local-variable 'after-change-functions) nil) |
110486
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
246 (set (make-local-variable 'nnimap-object) |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
247 (make-nnimap :server (nnoo-current-server 'nnimap))) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
248 (push (list buffer (current-buffer)) nnimap-connection-alist) |
110555
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
249 (push (current-buffer) nnimap-process-buffers) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
250 (current-buffer))) |
31717 | 251 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
252 (defun nnimap-open-shell-stream (name buffer host port) |
110428
6060b86fc551
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110422
diff
changeset
|
253 (let ((process-connection-type nil)) |
6060b86fc551
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110422
diff
changeset
|
254 (start-process name buffer shell-file-name |
6060b86fc551
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110422
diff
changeset
|
255 shell-command-switch |
6060b86fc551
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110422
diff
changeset
|
256 (format-spec |
6060b86fc551
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110422
diff
changeset
|
257 nnimap-shell-program |
6060b86fc551
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110422
diff
changeset
|
258 (format-spec-make |
6060b86fc551
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110422
diff
changeset
|
259 ?s host |
6060b86fc551
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110422
diff
changeset
|
260 ?p port))))) |
31717 | 261 |
110587
e474d7d76259
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110583
diff
changeset
|
262 (defun nnimap-credentials (address ports &optional inhibit-create) |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
263 (let (port credentials) |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
264 ;; Request the credentials from all ports, but only query on the |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
265 ;; last port if all the previous ones have failed. |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
266 (while (and (null credentials) |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
267 (setq port (pop ports))) |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
268 (setq credentials |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
269 (auth-source-user-or-password |
110587
e474d7d76259
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110583
diff
changeset
|
270 '("login" "password") address port nil |
e474d7d76259
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110583
diff
changeset
|
271 (if inhibit-create |
e474d7d76259
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110583
diff
changeset
|
272 nil |
e474d7d76259
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110583
diff
changeset
|
273 (null ports))))) |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
274 credentials)) |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
275 |
110555
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
276 (defun nnimap-keepalive () |
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
277 (let ((now (current-time))) |
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
278 (dolist (buffer nnimap-process-buffers) |
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
279 (when (buffer-name buffer) |
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
280 (with-current-buffer buffer |
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
281 (when (and nnimap-object |
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
282 (nnimap-last-command-time nnimap-object) |
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
283 (> (time-to-seconds |
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
284 (time-subtract |
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
285 now |
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
286 (nnimap-last-command-time nnimap-object))) |
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
287 ;; More than five minutes since the last command. |
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
288 (* 5 60))) |
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
289 (nnimap-send-command "NOOP"))))))) |
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
290 |
110918
236342431786
nnimap.el (gnutls-negotiate): Silence the byte compiler.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110917
diff
changeset
|
291 (declare-function gnutls-negotiate "subr" (fn file &optional arglist fileonly)) |
236342431786
nnimap.el (gnutls-negotiate): Silence the byte compiler.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110917
diff
changeset
|
292 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
293 (defun nnimap-open-connection (buffer) |
110555
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
294 (unless nnimap-keepalive-timer |
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
295 (setq nnimap-keepalive-timer (run-at-time (* 60 15) (* 60 15) |
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
296 'nnimap-keepalive))) |
110615
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
297 (block nil |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
298 (with-current-buffer (nnimap-make-process-buffer buffer) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
299 (let* ((coding-system-for-read 'binary) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
300 (coding-system-for-write 'binary) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
301 (port nil) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
302 (ports |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
303 (cond |
110908
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
304 ((or (eq nnimap-stream 'network) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
305 (and (eq nnimap-stream 'starttls) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
306 (fboundp 'open-gnutls-stream))) |
110615
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
307 (open-network-stream |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
308 "*nnimap*" (current-buffer) nnimap-address |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
309 (setq port |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
310 (or nnimap-server-port |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
311 (if (netrc-find-service-number "imap") |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
312 "imap" |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
313 "143")))) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
314 '("143" "imap")) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
315 ((eq nnimap-stream 'shell) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
316 (nnimap-open-shell-stream |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
317 "*nnimap*" (current-buffer) nnimap-address |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
318 (setq port (or nnimap-server-port "imap"))) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
319 '("imap")) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
320 ((eq nnimap-stream 'starttls) |
110666
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
321 (let ((tls-program (nnimap-extend-tls-programs))) |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
322 (open-tls-stream |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
323 "*nnimap*" (current-buffer) nnimap-address |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
324 (setq port (or nnimap-server-port "imap")) |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
325 'starttls)) |
110615
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
326 '("imap")) |
110763
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110689
diff
changeset
|
327 ((memq nnimap-stream '(ssl tls)) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
328 (funcall (if (fboundp 'open-gnutls-stream) |
110790
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110777
diff
changeset
|
329 'open-gnutls-stream |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110777
diff
changeset
|
330 'open-tls-stream) |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110777
diff
changeset
|
331 "*nnimap*" (current-buffer) nnimap-address |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110777
diff
changeset
|
332 (setq port |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110777
diff
changeset
|
333 (or nnimap-server-port |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110777
diff
changeset
|
334 (if (netrc-find-service-number "imaps") |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110777
diff
changeset
|
335 "imaps" |
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110777
diff
changeset
|
336 "993")))) |
110763
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110689
diff
changeset
|
337 '("143" "993" "imap" "imaps")) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110689
diff
changeset
|
338 (t |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110689
diff
changeset
|
339 (error "Unknown stream type: %s" nnimap-stream)))) |
110615
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
340 connection-result login-result credentials) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
341 (setf (nnimap-process nnimap-object) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
342 (get-buffer-process (current-buffer))) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
343 (if (not (and (nnimap-process nnimap-object) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
344 (memq (process-status (nnimap-process nnimap-object)) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
345 '(open run)))) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
346 (nnheader-report 'nnimap "Unable to contact %s:%s via %s" |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
347 nnimap-address port nnimap-stream) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
348 (gnus-set-process-query-on-exit-flag |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
349 (nnimap-process nnimap-object) nil) |
110615
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
350 (if (not (setq connection-result (nnimap-wait-for-connection))) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
351 (nnheader-report 'nnimap |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
352 "%s" (buffer-substring |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
353 (point) (line-end-position))) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
354 ;; Store the greeting (for debugging purposes). |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
355 (setf (nnimap-greeting nnimap-object) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
356 (buffer-substring (line-beginning-position) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
357 (line-end-position))) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
358 ;; Store the capabilities. |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
359 (setf (nnimap-capabilities nnimap-object) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
360 (mapcar |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
361 #'upcase |
110615
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
362 (nnimap-find-parameter |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
363 "CAPABILITY" (cdr (nnimap-command "CAPABILITY"))))) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
364 (when nnimap-server-port |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
365 (push (format "%s" nnimap-server-port) ports)) |
110666
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
366 ;; If this is a STARTTLS-capable server, then sever the |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
367 ;; connection and start a STARTTLS connection instead. |
110908
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
368 (cond |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
369 ((and (or (and (eq nnimap-stream 'network) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
370 (member "STARTTLS" |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
371 (nnimap-capabilities nnimap-object))) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
372 (eq nnimap-stream 'starttls)) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
373 (fboundp 'open-gnutls-stream)) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
374 (nnimap-command "STARTTLS") |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
375 (gnutls-negotiate (nnimap-process nnimap-object) nil)) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
376 ((and (eq nnimap-stream 'network) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
377 (member "STARTTLS" (nnimap-capabilities nnimap-object))) |
110666
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
378 (let ((nnimap-stream 'starttls)) |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
379 (let ((tls-process |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
380 (nnimap-open-connection buffer))) |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
381 ;; If the STARTTLS connection was successful, we |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
382 ;; kill our first non-encrypted connection. If it |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
383 ;; wasn't successful, we just use our unencrypted |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
384 ;; connection. |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
385 (when (memq (process-status tls-process) '(open run)) |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
386 (delete-process (nnimap-process nnimap-object)) |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
387 (kill-buffer (current-buffer)) |
110908
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
388 (return tls-process)))))) |
110615
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
389 (unless (equal connection-result "PREAUTH") |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
390 (if (not (setq credentials |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
391 (if (eq nnimap-authenticator 'anonymous) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
392 (list "anonymous" |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
393 (message-make-address)) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
394 (or |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
395 ;; First look for the credentials based |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
396 ;; on the virtual server name. |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
397 (nnimap-credentials |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
398 (nnoo-current-server 'nnimap) ports t) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
399 ;; Then look them up based on the |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
400 ;; physical address. |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
401 (nnimap-credentials nnimap-address ports))))) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
402 (setq nnimap-object nil) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
403 (setq login-result (nnimap-command "LOGIN %S %S" |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
404 (car credentials) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
405 (cadr credentials))) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
406 (unless (car login-result) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
407 ;; If the login failed, then forget the credentials |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
408 ;; that are now possibly cached. |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
409 (dolist (host (list (nnoo-current-server 'nnimap) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
410 nnimap-address)) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
411 (dolist (port ports) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
412 (dolist (element '("login" "password")) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
413 (auth-source-forget-user-or-password |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
414 element host port)))) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
415 (delete-process (nnimap-process nnimap-object)) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
416 (setq nnimap-object nil)))) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
417 (when nnimap-object |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
418 (when (member "QRESYNC" (nnimap-capabilities nnimap-object)) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
419 (nnimap-command "ENABLE QRESYNC")) |
110666
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
420 (nnimap-process nnimap-object)))))))) |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
421 |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
422 (defun nnimap-extend-tls-programs () |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
423 (let ((programs tls-program) |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
424 result) |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
425 (unless (consp programs) |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
426 (setq programs (list programs))) |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
427 (dolist (program programs) |
110679
400dd9dfdb7b
Give up on using gnutls-cli for starttls.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110666
diff
changeset
|
428 (when (assoc (car (split-string program)) tls-starttls-switches) |
400dd9dfdb7b
Give up on using gnutls-cli for starttls.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110666
diff
changeset
|
429 (push (if (not (string-match "%s" program)) |
400dd9dfdb7b
Give up on using gnutls-cli for starttls.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110666
diff
changeset
|
430 (concat program " " "%s") |
400dd9dfdb7b
Give up on using gnutls-cli for starttls.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110666
diff
changeset
|
431 program) |
400dd9dfdb7b
Give up on using gnutls-cli for starttls.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110666
diff
changeset
|
432 result))) |
110666
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
433 (nreverse result))) |
31717 | 434 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
435 (defun nnimap-find-parameter (parameter elems) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
436 (let (result) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
437 (dolist (elem elems) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
438 (cond |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
439 ((equal (car elem) parameter) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
440 (setq result (cdr elem))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
441 ((and (equal (car elem) "OK") |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
442 (consp (cadr elem)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
443 (equal (caadr elem) parameter)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
444 (setq result (cdr (cadr elem)))))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
445 result)) |
31717 | 446 |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
447 (deffoo nnimap-close-server (&optional server) |
110763
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110689
diff
changeset
|
448 (when (nnoo-change-server 'nnimap server nil) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110689
diff
changeset
|
449 (ignore-errors |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110689
diff
changeset
|
450 (delete-process (get-buffer-process (nnimap-buffer)))) |
0fe64d68a522
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110689
diff
changeset
|
451 t)) |
31717 | 452 |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
453 (deffoo nnimap-request-close () |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
454 t) |
31717 | 455 |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
456 (deffoo nnimap-server-opened (&optional server) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
457 (and (nnoo-current-server-p 'nnimap server) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
458 nntp-server-buffer |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
459 (gnus-buffer-live-p nntp-server-buffer) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
460 (nnimap-find-connection nntp-server-buffer))) |
31717 | 461 |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
462 (deffoo nnimap-status-message (&optional server) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
463 nnimap-status-string) |
31717 | 464 |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
465 (deffoo nnimap-request-article (article &optional group server to-buffer) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
466 (with-current-buffer nntp-server-buffer |
110433
33cf78a271ef
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110428
diff
changeset
|
467 (let ((result (nnimap-possibly-change-group group server)) |
110583
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
468 parts structure) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
469 (when (stringp article) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
470 (setq article (nnimap-find-article-by-message-id group article))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
471 (when (and result |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
472 article) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
473 (erase-buffer) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
474 (with-current-buffer (nnimap-buffer) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
475 (erase-buffer) |
110615
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
476 (when nnimap-fetch-partial-articles |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
477 (nnimap-command "UID FETCH %d (BODYSTRUCTURE)" article) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
478 (goto-char (point-min)) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
479 (when (re-search-forward "FETCH.*BODYSTRUCTURE" nil t) |
110661
2b8ece636433
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110633
diff
changeset
|
480 (setq structure (ignore-errors |
2b8ece636433
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110633
diff
changeset
|
481 (let ((start (point))) |
2b8ece636433
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110633
diff
changeset
|
482 (forward-sexp 1) |
2b8ece636433
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110633
diff
changeset
|
483 (downcase-region start (point)) |
2b8ece636433
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110633
diff
changeset
|
484 (goto-char (point)) |
2b8ece636433
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110633
diff
changeset
|
485 (read (current-buffer)))) |
110615
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
486 parts (nnimap-find-wanted-parts structure)))) |
110583
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
487 (when (if parts |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
488 (nnimap-get-partial-article article parts structure) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
489 (nnimap-get-whole-article article)) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
490 (let ((buffer (current-buffer))) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
491 (with-current-buffer (or to-buffer nntp-server-buffer) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
492 (erase-buffer) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
493 (insert-buffer-substring buffer) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
494 (nnheader-ms-strip-cr) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
495 (cons group article))))))))) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
496 |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
497 (defun nnimap-get-whole-article (article) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
498 (let ((result |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
499 (nnimap-command |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
500 (if (nnimap-ver4-p) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
501 "UID FETCH %d BODY.PEEK[]" |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
502 "UID FETCH %d RFC822.PEEK") |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
503 article))) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
504 ;; Check that we really got an article. |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
505 (goto-char (point-min)) |
110596
415e87a42437
mail-source.el (mail-source-value): Revert previous patch.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110587
diff
changeset
|
506 (unless (re-search-forward "\\* [0-9]+ FETCH" nil t) |
110583
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
507 (setq result nil)) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
508 (when result |
110596
415e87a42437
mail-source.el (mail-source-value): Revert previous patch.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110587
diff
changeset
|
509 ;; Remove any data that may have arrived before the FETCH data. |
415e87a42437
mail-source.el (mail-source-value): Revert previous patch.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110587
diff
changeset
|
510 (beginning-of-line) |
415e87a42437
mail-source.el (mail-source-value): Revert previous patch.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110587
diff
changeset
|
511 (unless (bobp) |
415e87a42437
mail-source.el (mail-source-value): Revert previous patch.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110587
diff
changeset
|
512 (delete-region (point-min) (point))) |
110583
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
513 (let ((bytes (nnimap-get-length))) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
514 (delete-region (line-beginning-position) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
515 (progn (forward-line 1) (point))) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
516 (goto-char (+ (point) bytes)) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
517 (delete-region (point) (point-max))) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
518 t))) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
519 |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
520 (defun nnimap-ver4-p () |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
521 (member "IMAP4REV1" (nnimap-capabilities nnimap-object))) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
522 |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
523 (defun nnimap-get-partial-article (article parts structure) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
524 (let ((result |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
525 (nnimap-command |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
526 "UID FETCH %d (%s %s)" |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
527 article |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
528 (if (nnimap-ver4-p) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
529 "BODY.PEEK[HEADER]" |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
530 "RFC822.HEADER") |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
531 (if (nnimap-ver4-p) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
532 (mapconcat (lambda (part) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
533 (format "BODY.PEEK[%s]" part)) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
534 parts " ") |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
535 (mapconcat (lambda (part) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
536 (format "RFC822.PEEK[%s]" part)) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
537 parts " "))))) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
538 (when result |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
539 (nnimap-convert-partial-article structure)))) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
540 |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
541 (defun nnimap-convert-partial-article (structure) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
542 ;; First just skip past the headers. |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
543 (goto-char (point-min)) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
544 (let ((bytes (nnimap-get-length)) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
545 id parts) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
546 ;; Delete "FETCH" line. |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
547 (delete-region (line-beginning-position) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
548 (progn (forward-line 1) (point))) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
549 (goto-char (+ (point) bytes)) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
550 ;; Collect all the body parts. |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
551 (while (looking-at ".*BODY\\[\\([.0-9]+\\)\\]") |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
552 (setq id (match-string 1) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
553 bytes (nnimap-get-length)) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
554 (beginning-of-line) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
555 (delete-region (point) (progn (forward-line 1) (point))) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
556 (push (list id (buffer-substring (point) (+ (point) bytes))) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
557 parts) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
558 (delete-region (point) (+ (point) bytes))) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
559 ;; Delete trailing junk. |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
560 (delete-region (point) (point-max)) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
561 ;; Now insert all the parts again where they fit in the structure. |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
562 (nnimap-insert-partial-structure structure parts) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
563 t)) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
564 |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
565 (defun nnimap-insert-partial-structure (structure parts &optional subp) |
110661
2b8ece636433
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110633
diff
changeset
|
566 (let (type boundary) |
2b8ece636433
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110633
diff
changeset
|
567 (let ((bstruc structure)) |
2b8ece636433
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110633
diff
changeset
|
568 (while (consp (car bstruc)) |
2b8ece636433
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110633
diff
changeset
|
569 (pop bstruc)) |
2b8ece636433
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110633
diff
changeset
|
570 (setq type (car bstruc)) |
2b8ece636433
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110633
diff
changeset
|
571 (setq bstruc (car (cdr bstruc))) |
2b8ece636433
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110633
diff
changeset
|
572 (when (and (stringp (car bstruc)) |
2b8ece636433
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110633
diff
changeset
|
573 (string= (downcase (car bstruc)) "boundary")) |
2b8ece636433
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110633
diff
changeset
|
574 (setq boundary (cadr bstruc)))) |
110583
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
575 (when subp |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
576 (insert (format "Content-type: multipart/%s; boundary=%S\n\n" |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
577 (downcase type) boundary))) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
578 (while (not (stringp (car structure))) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
579 (insert "\n--" boundary "\n") |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
580 (if (consp (caar structure)) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
581 (nnimap-insert-partial-structure (pop structure) parts t) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
582 (let ((bit (pop structure))) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
583 (insert (format "Content-type: %s/%s" |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
584 (downcase (nth 0 bit)) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
585 (downcase (nth 1 bit)))) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
586 (if (member "CHARSET" (nth 2 bit)) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
587 (insert (format |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
588 "; charset=%S\n" (cadr (member "CHARSET" (nth 2 bit))))) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
589 (insert "\n")) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
590 (insert (format "Content-transfer-encoding: %s\n" |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
591 (nth 5 bit))) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
592 (insert "\n") |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
593 (when (assoc (nth 9 bit) parts) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
594 (insert (cadr (assoc (nth 9 bit) parts))))))) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
595 (insert "\n--" boundary "--\n"))) |
110433
33cf78a271ef
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110428
diff
changeset
|
596 |
33cf78a271ef
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110428
diff
changeset
|
597 (defun nnimap-find-wanted-parts (structure) |
33cf78a271ef
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110428
diff
changeset
|
598 (message-flatten-list (nnimap-find-wanted-parts-1 structure ""))) |
33cf78a271ef
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110428
diff
changeset
|
599 |
33cf78a271ef
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110428
diff
changeset
|
600 (defun nnimap-find-wanted-parts-1 (structure prefix) |
33cf78a271ef
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110428
diff
changeset
|
601 (let ((num 1) |
33cf78a271ef
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110428
diff
changeset
|
602 parts) |
33cf78a271ef
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110428
diff
changeset
|
603 (while (consp (car structure)) |
33cf78a271ef
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110428
diff
changeset
|
604 (let ((sub (pop structure))) |
33cf78a271ef
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110428
diff
changeset
|
605 (if (consp (car sub)) |
33cf78a271ef
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110428
diff
changeset
|
606 (push (nnimap-find-wanted-parts-1 |
33cf78a271ef
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110428
diff
changeset
|
607 sub (if (string= prefix "") |
33cf78a271ef
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110428
diff
changeset
|
608 (number-to-string num) |
33cf78a271ef
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110428
diff
changeset
|
609 (format "%s.%s" prefix num))) |
33cf78a271ef
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110428
diff
changeset
|
610 parts) |
110583
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
611 (let ((type (format "%s/%s" (nth 0 sub) (nth 1 sub))) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
612 (id (if (string= prefix "") |
110433
33cf78a271ef
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110428
diff
changeset
|
613 (number-to-string num) |
110583
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
614 (format "%s.%s" prefix num)))) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
615 (setcar (nthcdr 9 sub) id) |
110615
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
616 (when (if (eq nnimap-fetch-partial-articles t) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
617 (equal id "1") |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
618 (string-match nnimap-fetch-partial-articles type)) |
110583
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
619 (push id parts)))) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
620 (incf num))) |
110433
33cf78a271ef
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110428
diff
changeset
|
621 (nreverse parts))) |
31717 | 622 |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
623 (deffoo nnimap-request-group (group &optional server dont-check info) |
110451
4b82113fd203
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110433
diff
changeset
|
624 (let ((result (nnimap-possibly-change-group group server)) |
4b82113fd203
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110433
diff
changeset
|
625 articles active marks high low) |
4b82113fd203
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110433
diff
changeset
|
626 (with-current-buffer nntp-server-buffer |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
627 (when result |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
628 (if (and dont-check |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
629 (setq active (nth 2 (assoc group nnimap-current-infos)))) |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
630 (insert (format "211 %d %d %d %S\n" |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
631 (- (cdr active) (car active)) |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
632 (car active) |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
633 (cdr active) |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
634 group)) |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
635 (with-current-buffer (nnimap-buffer) |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
636 (erase-buffer) |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
637 (let ((group-sequence |
110465
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
638 (nnimap-send-command "SELECT %S" (utf7-encode group t))) |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
639 (flag-sequence |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
640 (nnimap-send-command "UID FETCH 1:* FLAGS"))) |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
641 (nnimap-wait-for-response flag-sequence) |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
642 (setq marks |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
643 (nnimap-flags-to-marks |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
644 (nnimap-parse-flags |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
645 (list (list group-sequence flag-sequence |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
646 1 group "SELECT"))))) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
647 (when (and info |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
648 marks) |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
649 (nnimap-update-infos marks (list info))) |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
650 (goto-char (point-max)) |
110516
4d2f8b81bb01
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110502
diff
changeset
|
651 (let ((uidnext (nth 5 (car marks)))) |
110689
42815c76b976
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110679
diff
changeset
|
652 (setq high (or (if uidnext |
42815c76b976
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110679
diff
changeset
|
653 (1- uidnext) |
42815c76b976
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110679
diff
changeset
|
654 (nth 3 (car marks))) |
42815c76b976
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110679
diff
changeset
|
655 0) |
42815c76b976
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110679
diff
changeset
|
656 low (or (nth 4 (car marks)) uidnext 1))))) |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
657 (erase-buffer) |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
658 (insert |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
659 (format |
110465
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
660 "211 %d %d %d %S\n" (1+ (- high low)) low high group))) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
661 t)))) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
662 |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
663 (deffoo nnimap-request-create-group (group &optional server args) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
664 (when (nnimap-possibly-change-group nil server) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
665 (with-current-buffer (nnimap-buffer) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
666 (car (nnimap-command "CREATE %S" (utf7-encode group t)))))) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
667 |
110451
4b82113fd203
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110433
diff
changeset
|
668 (deffoo nnimap-request-delete-group (group &optional force server) |
4b82113fd203
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110433
diff
changeset
|
669 (when (nnimap-possibly-change-group nil server) |
4b82113fd203
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110433
diff
changeset
|
670 (with-current-buffer (nnimap-buffer) |
110465
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
671 (car (nnimap-command "DELETE %S" (utf7-encode group t)))))) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
672 |
110804
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110790
diff
changeset
|
673 (deffoo nnimap-request-rename-group (group new-name &optional server) |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110790
diff
changeset
|
674 (when (nnimap-possibly-change-group nil server) |
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110790
diff
changeset
|
675 (with-current-buffer (nnimap-buffer) |
110957
627742e646c4
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110918
diff
changeset
|
676 ;; Make sure we don't have this group open read/write by asking |
627742e646c4
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110918
diff
changeset
|
677 ;; to examine a mailbox that doesn't exist. This seems to be |
627742e646c4
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110918
diff
changeset
|
678 ;; the only way that allows us to reliably go back to unselected |
627742e646c4
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110918
diff
changeset
|
679 ;; state on Courier. |
627742e646c4
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110918
diff
changeset
|
680 (nnimap-command "EXAMINE DOES.NOT.EXIST") |
110917
3243e7055d49
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110908
diff
changeset
|
681 (setf (nnimap-group nnimap-object) nil) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
682 (car (nnimap-command "RENAME %S %S" |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
683 (utf7-encode group t) (utf7-encode new-name t)))))) |
110804
30fed27e97bc
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110790
diff
changeset
|
684 |
110465
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
685 (deffoo nnimap-request-expunge-group (group &optional server) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
686 (when (nnimap-possibly-change-group group server) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
687 (with-current-buffer (nnimap-buffer) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
688 (car (nnimap-command "EXPUNGE"))))) |
110451
4b82113fd203
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110433
diff
changeset
|
689 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
690 (defun nnimap-get-flags (spec) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
691 (let ((articles nil) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
692 elems end) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
693 (with-current-buffer (nnimap-buffer) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
694 (erase-buffer) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
695 (nnimap-wait-for-response (nnimap-send-command |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
696 "UID FETCH %s FLAGS" spec)) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
697 (setq end (point)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
698 (subst-char-in-region (point-min) (point-max) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
699 ?\\ ?% t) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
700 (goto-char (point-min)) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
701 (while (search-forward " FETCH " end t) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
702 (setq elems (read (current-buffer))) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
703 (push (cons (cadr (memq 'UID elems)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
704 (cadr (memq 'FLAGS elems))) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
705 articles))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
706 (nreverse articles))) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56280
diff
changeset
|
707 |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
708 (deffoo nnimap-close-group (group &optional server) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
709 t) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
710 |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
711 (deffoo nnimap-request-move-article (article group server accept-form |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
712 &optional last internal-move-group) |
110465
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
713 (with-temp-buffer |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
714 (when (nnimap-request-article article group server (current-buffer)) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
715 ;; If the move is internal (on the same server), just do it the easy |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
716 ;; way. |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
717 (let ((message-id (message-field-value "message-id"))) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
718 (if internal-move-group |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
719 (let ((result |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
720 (with-current-buffer (nnimap-buffer) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
721 (nnimap-command "UID COPY %d %S" |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
722 article |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
723 (utf7-encode internal-move-group t))))) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
724 (when (car result) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
725 (nnimap-delete-article article) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
726 (cons internal-move-group |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
727 (nnimap-find-article-by-message-id |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
728 internal-move-group message-id)))) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
729 ;; Move the article to a different method. |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
730 (let ((result (eval accept-form))) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
731 (when result |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
732 (nnimap-delete-article article) |
110465
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
733 result))))))) |
31717 | 734 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
735 (deffoo nnimap-request-expire-articles (articles group &optional server force) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
736 (cond |
110465
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
737 ((null articles) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
738 nil) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
739 ((not (nnimap-possibly-change-group group server)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
740 articles) |
110465
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
741 ((and force |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
742 (eq nnmail-expiry-target 'delete)) |
110596
415e87a42437
mail-source.el (mail-source-value): Revert previous patch.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110587
diff
changeset
|
743 (unless (nnimap-delete-article (gnus-compress-sequence articles)) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
744 (message "Article marked for deletion, but not expunged.")) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
745 nil) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
746 (t |
110465
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
747 (let ((deletable-articles |
110486
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
748 (if (or force |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
749 (eq nnmail-expiry-wait 'immediate)) |
110465
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
750 articles |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
751 (gnus-sorted-intersection |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
752 articles |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
753 (nnimap-find-expired-articles group))))) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
754 (if (null deletable-articles) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
755 articles |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
756 (if (eq nnmail-expiry-target 'delete) |
110596
415e87a42437
mail-source.el (mail-source-value): Revert previous patch.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110587
diff
changeset
|
757 (nnimap-delete-article (gnus-compress-sequence deletable-articles)) |
110465
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
758 (setq deletable-articles |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
759 (nnimap-process-expiry-targets |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
760 deletable-articles group server))) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
761 ;; Return the articles we didn't delete. |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
762 (gnus-sorted-complement articles deletable-articles)))))) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
763 |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
764 (defun nnimap-process-expiry-targets (articles group server) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
765 (let ((deleted-articles nil)) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
766 (dolist (article articles) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
767 (let ((target nnmail-expiry-target)) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
768 (with-temp-buffer |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
769 (when (nnimap-request-article article group server (current-buffer)) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
770 (message "Expiring article %s:%d" group article) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
771 (when (functionp target) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
772 (setq target (funcall target group))) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
773 (when (and target |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
774 (not (eq target 'delete))) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
775 (if (or (gnus-request-group target t) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
776 (gnus-request-create-group target)) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
777 (nnmail-expiry-target-group target group) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
778 (setq target nil))) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
779 (when target |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
780 (push article deleted-articles)))))) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
781 ;; Change back to the current group again. |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
782 (nnimap-possibly-change-group group server) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
783 (setq deleted-articles (nreverse deleted-articles)) |
110596
415e87a42437
mail-source.el (mail-source-value): Revert previous patch.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110587
diff
changeset
|
784 (nnimap-delete-article (gnus-compress-sequence deleted-articles)) |
110465
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
785 deleted-articles)) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
786 |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
787 (defun nnimap-find-expired-articles (group) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
788 (let ((cutoff (nnmail-expired-article-p group nil nil))) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
789 (with-current-buffer (nnimap-buffer) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
790 (let ((result |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
791 (nnimap-command |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
792 "UID SEARCH SENTBEFORE %s" |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
793 (format-time-string |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
794 (format "%%d-%s-%%Y" |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
795 (upcase |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
796 (car (rassoc (nth 4 (decode-time cutoff)) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
797 parse-time-months)))) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
798 cutoff)))) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
799 (and (car result) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
800 (delete 0 (mapcar #'string-to-number |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
801 (cdr (assoc "SEARCH" (cdr result)))))))))) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
802 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
803 |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
804 (defun nnimap-find-article-by-message-id (group message-id) |
110666
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
805 (with-current-buffer (nnimap-buffer) |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
806 (erase-buffer) |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
807 (setf (nnimap-group nnimap-object) nil) |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
808 (nnimap-send-command "EXAMINE %S" (utf7-encode group t)) |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
809 (let ((sequence |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
810 (nnimap-send-command "UID SEARCH HEADER Message-Id %S" message-id)) |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
811 article result) |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
812 (setq result (nnimap-wait-for-response sequence)) |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
813 (when (and result |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
814 (car (setq result (nnimap-parse-response)))) |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
815 ;; Select the last instance of the message in the group. |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
816 (and (setq article |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
817 (car (last (assoc "SEARCH" (cdr result))))) |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
818 (string-to-number article)))))) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
819 |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
820 (defun nnimap-delete-article (articles) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
821 (with-current-buffer (nnimap-buffer) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
822 (nnimap-command "UID STORE %s +FLAGS.SILENT (\\Deleted)" |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
823 (nnimap-article-ranges articles)) |
110465
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
824 (cond |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
825 ((member "UIDPLUS" (nnimap-capabilities nnimap-object)) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
826 (nnimap-command "UID EXPUNGE %s" |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
827 (nnimap-article-ranges articles)) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
828 t) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
829 (nnimap-expunge |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
830 (nnimap-command "EXPUNGE") |
110479
437c7aaf08fd
nnimap.el (nnimap-delete-article): Tell user if expunge won't happen.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110465
diff
changeset
|
831 t) |
437c7aaf08fd
nnimap.el (nnimap-delete-article): Tell user if expunge won't happen.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110465
diff
changeset
|
832 (t (gnus-message 7 (concat "nnimap: nnimap-expunge is not set and the " |
437c7aaf08fd
nnimap.el (nnimap-delete-article): Tell user if expunge won't happen.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110465
diff
changeset
|
833 "server doesn't support UIDPLUS, so we won't " |
437c7aaf08fd
nnimap.el (nnimap-delete-article): Tell user if expunge won't happen.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110465
diff
changeset
|
834 "delete this article now")))))) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
835 |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
836 (deffoo nnimap-request-scan (&optional group server) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
837 (when (and (nnimap-possibly-change-group nil server) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
838 nnimap-inbox |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
839 nnimap-split-methods) |
110486
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
840 (message "nnimap %s splitting mail..." server) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
841 (nnimap-split-incoming-mail))) |
31717 | 842 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
843 (defun nnimap-marks-to-flags (marks) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
844 (let (flags flag) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
845 (dolist (mark marks) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
846 (when (setq flag (cadr (assq mark nnimap-mark-alist))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
847 (push flag flags))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
848 flags)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
849 |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
850 (deffoo nnimap-request-set-mark (group actions &optional server) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
851 (when (nnimap-possibly-change-group group server) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
852 (let (sequence) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
853 (with-current-buffer (nnimap-buffer) |
110661
2b8ece636433
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110633
diff
changeset
|
854 (erase-buffer) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
855 ;; Just send all the STORE commands without waiting for |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
856 ;; response. If they're successful, they're successful. |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
857 (dolist (action actions) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
858 (destructuring-bind (range action marks) action |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
859 (let ((flags (nnimap-marks-to-flags marks))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
860 (when flags |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
861 (setq sequence (nnimap-send-command |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
862 "UID STORE %s %sFLAGS.SILENT (%s)" |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
863 (nnimap-article-ranges range) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
864 (if (eq action 'del) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
865 "-" |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
866 "+") |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
867 (mapconcat #'identity flags " "))))))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
868 ;; Wait for the last command to complete to avoid later |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
869 ;; syncronisation problems with the stream. |
110451
4b82113fd203
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110433
diff
changeset
|
870 (when sequence |
4b82113fd203
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110433
diff
changeset
|
871 (nnimap-wait-for-response sequence)))))) |
31717 | 872 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
873 (deffoo nnimap-request-accept-article (group &optional server last) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
874 (when (nnimap-possibly-change-group nil server) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
875 (nnmail-check-syntax) |
110666
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
876 (let ((message-id (message-field-value "message-id")) |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
877 sequence message) |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
878 (nnimap-add-cr) |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
879 (setq message (buffer-string)) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
880 (with-current-buffer (nnimap-buffer) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
881 (setq sequence (nnimap-send-command |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
882 "APPEND %S {%d}" (utf7-encode group t) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
883 (length message))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
884 (process-send-string (get-buffer-process (current-buffer)) message) |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
885 (process-send-string (get-buffer-process (current-buffer)) |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
886 (if (nnimap-newlinep nnimap-object) |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
887 "\n" |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
888 "\r\n")) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
889 (let ((result (nnimap-get-response sequence))) |
110604
71a0913fcc8c
gnus-html.el (gnus-html-wash-tags): Decode URL entities to avoid handing broken links to browse-url.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110596
diff
changeset
|
890 (if (not (car result)) |
71a0913fcc8c
gnus-html.el (gnus-html-wash-tags): Decode URL entities to avoid handing broken links to browse-url.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110596
diff
changeset
|
891 (progn |
71a0913fcc8c
gnus-html.el (gnus-html-wash-tags): Decode URL entities to avoid handing broken links to browse-url.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110596
diff
changeset
|
892 (message "%s" (nnheader-get-report-string 'nnimap)) |
71a0913fcc8c
gnus-html.el (gnus-html-wash-tags): Decode URL entities to avoid handing broken links to browse-url.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110596
diff
changeset
|
893 nil) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
894 (cons group |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
895 (nnimap-find-article-by-message-id group message-id)))))))) |
31717 | 896 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
897 (defun nnimap-add-cr () |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
898 (goto-char (point-min)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
899 (while (re-search-forward "\r?\n" nil t) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
900 (replace-match "\r\n" t t))) |
31717 | 901 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
902 (defun nnimap-get-groups () |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
903 (let ((result (nnimap-command "LIST \"\" \"*\"")) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
904 groups) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
905 (when (car result) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
906 (dolist (line (cdr result)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
907 (when (and (equal (car line) "LIST") |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
908 (not (and (caadr line) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
909 (string-match "noselect" (caadr line))))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
910 (push (car (last line)) groups))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
911 (nreverse groups)))) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56280
diff
changeset
|
912 |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
913 (deffoo nnimap-request-list (&optional server) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
914 (nnimap-possibly-change-group nil server) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
915 (with-current-buffer nntp-server-buffer |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
916 (erase-buffer) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
917 (let ((groups |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
918 (with-current-buffer (nnimap-buffer) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
919 (nnimap-get-groups))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
920 sequences responses) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
921 (when groups |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
922 (with-current-buffer (nnimap-buffer) |
110486
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
923 (setf (nnimap-group nnimap-object) nil) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56280
diff
changeset
|
924 (dolist (group groups) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
925 (push (list (nnimap-send-command "EXAMINE %S" (utf7-encode group t)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
926 group) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
927 sequences)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
928 (nnimap-wait-for-response (caar sequences)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
929 (setq responses |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
930 (nnimap-get-responses (mapcar #'car sequences)))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
931 (dolist (response responses) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
932 (let* ((sequence (car response)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
933 (response (cadr response)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
934 (group (cadr (assoc sequence sequences)))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
935 (when (and group |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
936 (equal (caar response) "OK")) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
937 (let ((uidnext (nnimap-find-parameter "UIDNEXT" response)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
938 highest exists) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
939 (dolist (elem response) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
940 (when (equal (cadr elem) "EXISTS") |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
941 (setq exists (string-to-number (car elem))))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
942 (when uidnext |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
943 (setq highest (1- (string-to-number (car uidnext))))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
944 (cond |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
945 ((null highest) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
946 (insert (format "%S 0 1 y\n" (utf7-decode group t)))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
947 ((zerop exists) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
948 ;; Empty group. |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
949 (insert (format "%S %d %d y\n" |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
950 (utf7-decode group t) highest (1+ highest)))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
951 (t |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
952 ;; Return the widest possible range. |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
953 (insert (format "%S %d 1 y\n" (utf7-decode group t) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
954 (or highest exists))))))))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
955 t)))) |
31717 | 956 |
110689
42815c76b976
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110679
diff
changeset
|
957 (deffoo nnimap-request-newgroups (date &optional server) |
42815c76b976
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110679
diff
changeset
|
958 (nnimap-possibly-change-group nil server) |
42815c76b976
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110679
diff
changeset
|
959 (with-current-buffer nntp-server-buffer |
42815c76b976
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110679
diff
changeset
|
960 (erase-buffer) |
42815c76b976
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110679
diff
changeset
|
961 (dolist (group (with-current-buffer (nnimap-buffer) |
42815c76b976
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110679
diff
changeset
|
962 (nnimap-get-groups))) |
42815c76b976
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110679
diff
changeset
|
963 (unless (assoc group nnimap-current-infos) |
42815c76b976
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110679
diff
changeset
|
964 ;; Insert dummy numbers here -- they don't matter. |
110777
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110763
diff
changeset
|
965 (insert (format "%S 0 1 y\n" group)))) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110763
diff
changeset
|
966 t)) |
110689
42815c76b976
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110679
diff
changeset
|
967 |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
968 (deffoo nnimap-retrieve-group-data-early (server infos) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
969 (when (nnimap-possibly-change-group nil server) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
970 (with-current-buffer (nnimap-buffer) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
971 (erase-buffer) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
972 (setf (nnimap-group nnimap-object) nil) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
973 ;; QRESYNC handling isn't implemented. |
110908
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
974 (let ((qresyncp (member "QRESYNC" (nnimap-capabilities nnimap-object))) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
975 params groups sequences active uidvalidity modseq group) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
976 ;; Go through the infos and gather the data needed to know |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
977 ;; what and how to request the data. |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
978 (dolist (info infos) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
979 (setq params (gnus-info-params info) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
980 group (gnus-group-real-name (gnus-info-group info)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
981 active (cdr (assq 'active params)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
982 uidvalidity (cdr (assq 'uidvalidity params)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
983 modseq (cdr (assq 'modseq params))) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
984 (if (and qresyncp |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
985 uidvalidity |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
986 modseq) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
987 (push |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
988 (list (nnimap-send-command "EXAMINE %S (QRESYNC (%s %s))" |
110908
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
989 (utf7-encode group t) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
990 uidvalidity modseq) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
991 'qresync |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
992 nil group 'qresync) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
993 sequences) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
994 (let ((start |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
995 (if (and active uidvalidity) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
996 ;; Fetch the last 100 flags. |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
997 (max 1 (- (cdr active) 100)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
998 1)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
999 (command |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1000 (if uidvalidity |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1001 "EXAMINE" |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1002 ;; If we don't have a UIDVALIDITY, then this is |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1003 ;; the first time we've seen the group, so we |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1004 ;; have to do a SELECT (which is slower than an |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1005 ;; examine), but will tell us whether the group |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1006 ;; is read-only or not. |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1007 "SELECT"))) |
110908
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1008 (push (list (nnimap-send-command "%s %S" command |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1009 (utf7-encode group t)) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1010 (nnimap-send-command "UID FETCH %d:* FLAGS" start) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1011 start group command) |
110583
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
1012 sequences))) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
1013 ;; Some servers apparently can't have many outstanding |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
1014 ;; commands, so throttle them. |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
1015 (when (and (not nnimap-streaming) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
1016 (car sequences)) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
1017 (nnimap-wait-for-response (caar sequences)))) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1018 sequences)))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1019 |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
1020 (deffoo nnimap-finish-retrieve-group-infos (server infos sequences) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1021 (when (and sequences |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1022 (nnimap-possibly-change-group nil server)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1023 (with-current-buffer (nnimap-buffer) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1024 ;; Wait for the final data to trickle in. |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1025 (when (nnimap-wait-for-response (if (eq (cadar sequences) 'qresync) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1026 (caar sequences) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1027 (cadar sequences)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1028 t) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1029 ;; Now we should have most of the data we need, no matter |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1030 ;; whether we're QRESYNCING, fetching all the flags from |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1031 ;; scratch, or just fetching the last 100 flags per group. |
110583
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
1032 (nnimap-update-infos (nnimap-flags-to-marks |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
1033 (nnimap-parse-flags |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
1034 (nreverse sequences))) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
1035 infos) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
1036 ;; Finally, just return something resembling an active file in |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
1037 ;; the nntp buffer, so that the agent can save the info, too. |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
1038 (with-current-buffer nntp-server-buffer |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
1039 (erase-buffer) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
1040 (dolist (info infos) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
1041 (let* ((group (gnus-info-group info)) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
1042 (active (gnus-active group))) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
1043 (when active |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
1044 (insert (format "%S %d %d y\n" |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
1045 (gnus-group-real-name group) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
1046 (cdr active) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
1047 (car active))))))))))) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1048 |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1049 (defun nnimap-update-infos (flags infos) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1050 (dolist (info infos) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1051 (let* ((group (gnus-group-real-name (gnus-info-group info))) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1052 (marks (cdr (assoc group flags)))) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1053 (when marks |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1054 (nnimap-update-info info marks))))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49274
diff
changeset
|
1055 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1056 (defun nnimap-update-info (info marks) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1057 (destructuring-bind (existing flags high low uidnext start-article |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1058 permanent-flags uidvalidity |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1059 vanished highestmodseq) marks |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1060 (cond |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1061 ;; Ignore groups with no UIDNEXT/marks. This happens for |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1062 ;; completely empty groups. |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1063 ((and (not existing) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1064 (not uidnext)) |
110908
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1065 (let ((active (cdr (assq 'active (gnus-info-params info))))) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1066 (when active |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1067 (gnus-set-active (gnus-info-group info) active)))) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1068 ;; We have a mismatch between the old and new UIDVALIDITY |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1069 ;; identifiers, so we have to re-request the group info (the next |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1070 ;; time). This virtually never happens. |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1071 ((let ((old-uidvalidity |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1072 (cdr (assq 'uidvalidity (gnus-info-params info))))) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1073 (and old-uidvalidity |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1074 (not (equal old-uidvalidity uidvalidity)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1075 (> start-article 1))) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1076 (gnus-group-remove-parameter info 'uidvalidity) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1077 (gnus-group-remove-parameter info 'modseq)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1078 ;; We have the data needed to update. |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1079 (t |
110908
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1080 (let* ((group (gnus-info-group info)) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1081 (completep (and start-article |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1082 (= start-article 1))) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1083 (active (or (gnus-active group) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1084 (cdr (assq 'active (gnus-info-params info)))))) |
110516
4d2f8b81bb01
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110502
diff
changeset
|
1085 (when uidnext |
4d2f8b81bb01
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110502
diff
changeset
|
1086 (setq high (1- uidnext))) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1087 ;; First set the active ranges based on high/low. |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1088 (if (or completep |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1089 (not (gnus-active group))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1090 (gnus-set-active group |
110555
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
1091 (cond |
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
1092 ((and low high) |
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
1093 (cons low high)) |
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
1094 (uidnext |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1095 ;; No articles in this group. |
110555
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
1096 (cons uidnext (1- uidnext))) |
110908
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1097 (active |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1098 active) |
110555
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
1099 (start-article |
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
1100 (cons start-article (1- start-article))) |
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
1101 (t |
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
1102 ;; No articles and no uidnext. |
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
1103 nil))) |
110615
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
1104 (gnus-set-active |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
1105 group |
110908
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1106 (cons (car active) |
110615
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
1107 (or high (1- uidnext))))) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1108 ;; See whether this is a read-only group. |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1109 (unless (eq permanent-flags 'not-scanned) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1110 (gnus-group-set-parameter |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1111 info 'permanent-flags |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1112 (if (memq '%* permanent-flags) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1113 t |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1114 nil))) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1115 ;; Update marks and read articles if this isn't a |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1116 ;; read-only IMAP group. |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1117 (when (cdr (assq 'permanent-flags (gnus-info-params info))) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1118 (if (and highestmodseq |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1119 (not start-article)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1120 ;; We've gotten the data by QRESYNCing. |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1121 (nnimap-update-qresync-info |
110908
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1122 info existing (nnimap-imap-ranges-to-gnus-ranges vanished) flags) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1123 ;; Do normal non-QRESYNC flag updates. |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1124 ;; Update the list of read articles. |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1125 (let* ((unread |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1126 (gnus-compress-sequence |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1127 (gnus-set-difference |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1128 (gnus-set-difference |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1129 existing |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1130 (cdr (assoc '%Seen flags))) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1131 (cdr (assoc '%Flagged flags))))) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1132 (read (gnus-range-difference |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1133 (cons start-article high) unread))) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1134 (when (> start-article 1) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1135 (setq read |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1136 (gnus-range-nconcat |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1137 (if (> start-article 1) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1138 (gnus-sorted-range-intersection |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1139 (cons 1 (1- start-article)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1140 (gnus-info-read info)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1141 (gnus-info-read info)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1142 read))) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1143 (gnus-info-set-read info read) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1144 ;; Update the marks. |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1145 (setq marks (gnus-info-marks info)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1146 (dolist (type (cdr nnimap-mark-alist)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1147 (let ((old-marks (assoc (car type) marks)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1148 (new-marks |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1149 (gnus-compress-sequence |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1150 (cdr (or (assoc (caddr type) flags) ; %Flagged |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1151 (assoc (intern (cadr type) obarray) flags) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1152 (assoc (cadr type) flags)))))) ; "\Flagged" |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1153 (setq marks (delq old-marks marks)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1154 (pop old-marks) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1155 (when (and old-marks |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1156 (> start-article 1)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1157 (setq old-marks (gnus-range-difference |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1158 old-marks |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1159 (cons start-article high))) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1160 (setq new-marks (gnus-range-nconcat old-marks new-marks))) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1161 (when new-marks |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1162 (push (cons (car type) new-marks) marks))) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1163 (gnus-info-set-marks info marks t))))) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1164 ;; Note the active level for the next run-through. |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1165 (gnus-group-set-parameter info 'active (gnus-active group)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1166 (gnus-group-set-parameter info 'uidvalidity uidvalidity) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1167 (gnus-group-set-parameter info 'modseq highestmodseq) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1168 (nnimap-store-info info (gnus-active group))))))) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1169 |
110908
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1170 (defun nnimap-update-qresync-info (info existing vanished flags) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1171 ;; Add all the vanished articles to the list of read articles. |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1172 (gnus-info-set-read |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1173 info |
110908
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1174 (gnus-add-to-range |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1175 (gnus-add-to-range |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1176 (gnus-range-add (gnus-info-read info) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1177 vanished) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1178 (cdr (assq '%Flagged flags))) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1179 (cdr (assq '%Seen flags)))) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1180 (let ((marks (gnus-info-marks info))) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1181 (dolist (type (cdr nnimap-mark-alist)) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1182 (let ((ticks (assoc (car type) marks)) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1183 (new-marks |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1184 (cdr (or (assoc (caddr type) flags) ; %Flagged |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1185 (assoc (intern (cadr type) obarray) flags) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1186 (assoc (cadr type) flags))))) ; "\Flagged" |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1187 (setq marks (delq ticks marks)) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1188 (pop ticks) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1189 ;; Add the new marks we got. |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1190 (setq ticks (gnus-add-to-range ticks new-marks)) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1191 ;; Remove the marks from messages that don't have them. |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1192 (setq ticks (gnus-remove-from-range |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1193 ticks |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1194 (gnus-compress-sequence |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1195 (gnus-sorted-complement existing new-marks)))) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1196 (when ticks |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1197 (push (cons (car type) ticks) marks))) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1198 (gnus-info-set-marks info marks t)))) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1199 |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1200 (defun nnimap-imap-ranges-to-gnus-ranges (irange) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1201 (if (zerop (length irange)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1202 nil |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1203 (let ((result nil)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1204 (dolist (elem (split-string irange ",")) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1205 (push |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1206 (if (string-match ":" elem) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1207 (let ((numbers (split-string elem ":"))) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1208 (cons (string-to-number (car numbers)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1209 (string-to-number (cadr numbers)))) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1210 (string-to-number elem)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1211 result)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1212 (nreverse result)))) |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
1213 |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
1214 (defun nnimap-store-info (info active) |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
1215 (let* ((group (gnus-group-real-name (gnus-info-group info))) |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
1216 (entry (assoc group nnimap-current-infos))) |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
1217 (if entry |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
1218 (setcdr entry (list info active)) |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
1219 (push (list group info active) nnimap-current-infos)))) |
31717 | 1220 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1221 (defun nnimap-flags-to-marks (groups) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1222 (let (data group totalp uidnext articles start-article mark permanent-flags |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1223 uidvalidity vanished highestmodseq) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1224 (dolist (elem groups) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1225 (setq group (car elem) |
110486
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1226 uidnext (nth 1 elem) |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1227 start-article (nth 2 elem) |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1228 permanent-flags (nth 3 elem) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1229 uidvalidity (nth 4 elem) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1230 vanished (nth 5 elem) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1231 highestmodseq (nth 6 elem) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1232 articles (nthcdr 7 elem)) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1233 (let ((high (caar articles)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1234 marks low existing) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1235 (dolist (article articles) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1236 (setq low (car article)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1237 (push (car article) existing) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1238 (dolist (flag (cdr article)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1239 (setq mark (assoc flag marks)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1240 (if (not mark) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1241 (push (list flag (car article)) marks) |
110486
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1242 (setcdr mark (cons (car article) (cdr mark)))))) |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1243 (push (list group existing marks high low uidnext start-article |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1244 permanent-flags uidvalidity vanished highestmodseq) |
110486
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1245 data))) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1246 data)) |
31717 | 1247 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1248 (defun nnimap-parse-flags (sequences) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1249 (goto-char (point-min)) |
110486
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1250 ;; Change \Delete etc to %Delete, so that the reader can read it. |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1251 (subst-char-in-region (point-min) (point-max) |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1252 ?\\ ?% t) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1253 (let (start end articles groups uidnext elems permanent-flags |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1254 uidvalidity vanished highestmodseq) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1255 (dolist (elem sequences) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1256 (destructuring-bind (group-sequence flag-sequence totalp group command) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1257 elem |
110486
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1258 (setq start (point)) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1259 (when (and |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1260 ;; The EXAMINE was successful. |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1261 (search-forward (format "\n%d OK " group-sequence) nil t) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1262 (progn |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1263 (forward-line 1) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1264 (setq end (point)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1265 (goto-char start) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1266 (setq permanent-flags |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1267 (if (equal command "SELECT") |
110486
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1268 (and (search-forward "PERMANENTFLAGS " |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1269 (or end (point-min)) t) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1270 (read (current-buffer))) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1271 'not-scanned)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1272 (goto-char start) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1273 (setq uidnext |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1274 (and (search-forward "UIDNEXT " |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1275 (or end (point-min)) t) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1276 (read (current-buffer)))) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1277 (goto-char start) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1278 (setq uidvalidity |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1279 (and (re-search-forward "UIDVALIDITY \\([0-9]+\\)" |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1280 (or end (point-min)) t) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1281 ;; Store UIDVALIDITY as a string, as it's |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1282 ;; too big for 32-bit Emacsen, usually. |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1283 (match-string 1))) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1284 (goto-char start) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1285 (setq vanished |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1286 (and (eq flag-sequence 'qresync) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1287 (re-search-forward "VANISHED.* \\([0-9:,]+\\)" |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1288 (or end (point-min)) t) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1289 (match-string 1))) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1290 (goto-char start) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1291 (setq highestmodseq |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1292 (and (search-forward "HIGHESTMODSEQ " |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1293 (or end (point-min)) t) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1294 (read (current-buffer)))) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1295 (goto-char end) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1296 (forward-line -1)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1297 ;; The UID FETCH FLAGS was successful. |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1298 (or (eq flag-sequence 'qresync) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1299 (search-forward (format "\n%d OK " flag-sequence) nil t))) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1300 (if (eq flag-sequence 'qresync) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1301 (progn |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1302 (goto-char start) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1303 (setq start end)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1304 (setq start (point)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1305 (goto-char end)) |
110486
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1306 (while (search-forward " FETCH " start t) |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1307 (setq elems (read (current-buffer))) |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1308 (push (cons (cadr (memq 'UID elems)) |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1309 (cadr (memq 'FLAGS elems))) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1310 articles)) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1311 (push (nconc (list group uidnext totalp permanent-flags uidvalidity |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1312 vanished highestmodseq) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1313 articles) |
110486
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1314 groups) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1315 (goto-char end) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1316 (setq articles nil)))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1317 groups)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1318 |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1319 (defun nnimap-find-process-buffer (buffer) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1320 (cadr (assoc buffer nnimap-connection-alist))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1321 |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
1322 (deffoo nnimap-request-post (&optional server) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1323 (setq nnimap-status-string "Read-only server") |
31717 | 1324 nil) |
1325 | |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1326 (defun nnimap-possibly-change-group (group server) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1327 (let ((open-result t)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1328 (when (and server |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1329 (not (nnimap-server-opened server))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1330 (setq open-result (nnimap-open-server server))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1331 (cond |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1332 ((not open-result) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1333 nil) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1334 ((not group) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1335 t) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1336 (t |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1337 (with-current-buffer (nnimap-buffer) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1338 (if (equal group (nnimap-group nnimap-object)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1339 t |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1340 (let ((result (nnimap-command "SELECT %S" (utf7-encode group t)))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1341 (when (car result) |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
1342 (setf (nnimap-group nnimap-object) group |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
1343 (nnimap-select-result nnimap-object) result) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1344 result)))))))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1345 |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1346 (defun nnimap-find-connection (buffer) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1347 "Find the connection delivering to BUFFER." |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1348 (let ((entry (assoc buffer nnimap-connection-alist))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1349 (when entry |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1350 (if (and (buffer-name (cadr entry)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1351 (get-buffer-process (cadr entry)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1352 (memq (process-status (get-buffer-process (cadr entry))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1353 '(open run))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1354 (get-buffer-process (cadr entry)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1355 (setq nnimap-connection-alist (delq entry nnimap-connection-alist)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1356 nil)))) |
31717 | 1357 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1358 (defvar nnimap-sequence 0) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1359 |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1360 (defun nnimap-send-command (&rest args) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1361 (process-send-string |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1362 (get-buffer-process (current-buffer)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1363 (nnimap-log-command |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
1364 (format "%d %s%s\n" |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1365 (incf nnimap-sequence) |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
1366 (apply #'format args) |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
1367 (if (nnimap-newlinep nnimap-object) |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
1368 "" |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
1369 "\r")))) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1370 nnimap-sequence) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49274
diff
changeset
|
1371 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1372 (defun nnimap-log-command (command) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1373 (with-current-buffer (get-buffer-create "*imap log*") |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1374 (goto-char (point-max)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1375 (insert (format-time-string "%H:%M:%S") " " command)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1376 command) |
31717 | 1377 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1378 (defun nnimap-command (&rest args) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1379 (erase-buffer) |
110555
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
1380 (setf (nnimap-last-command-time nnimap-object) (current-time)) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1381 (let* ((sequence (apply #'nnimap-send-command args)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1382 (response (nnimap-get-response sequence))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1383 (if (equal (caar response) "OK") |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1384 (cons t response) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1385 (nnheader-report 'nnimap "%s" |
110451
4b82113fd203
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110433
diff
changeset
|
1386 (mapconcat (lambda (a) |
4b82113fd203
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110433
diff
changeset
|
1387 (format "%s" a)) |
4b82113fd203
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110433
diff
changeset
|
1388 (car response) " ")) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1389 nil))) |
31717 | 1390 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1391 (defun nnimap-get-response (sequence) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1392 (nnimap-wait-for-response sequence) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1393 (nnimap-parse-response)) |
31717 | 1394 |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
1395 (defun nnimap-wait-for-connection () |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
1396 (let ((process (get-buffer-process (current-buffer)))) |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
1397 (goto-char (point-min)) |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
1398 (while (and (memq (process-status process) |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
1399 '(open run)) |
110666
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
1400 (not (re-search-forward "^[*.] .*\n" nil t))) |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
1401 (nnheader-accept-process-output process) |
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
1402 (goto-char (point-min))) |
110433
33cf78a271ef
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110428
diff
changeset
|
1403 (forward-line -1) |
110666
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
1404 (and (looking-at "[*.] \\([A-Z0-9]+\\)") |
110433
33cf78a271ef
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110428
diff
changeset
|
1405 (match-string 1)))) |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110419
diff
changeset
|
1406 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1407 (defun nnimap-wait-for-response (sequence &optional messagep) |
110583
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
1408 (let ((process (get-buffer-process (current-buffer))) |
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
1409 openp) |
110908
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1410 (condition-case nil |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1411 (progn |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1412 (goto-char (point-max)) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1413 (while (and (setq openp (memq (process-status process) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1414 '(open run))) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1415 (not (re-search-backward |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1416 (format "^%d .*\n" sequence) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1417 (if nnimap-streaming |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1418 (max (point-min) (- (point) 500)) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1419 (point-min)) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1420 t))) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1421 (when messagep |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1422 (message "nnimap read %dk" (/ (buffer-size) 1000))) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1423 (nnheader-accept-process-output process) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1424 (goto-char (point-max))) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1425 openp) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1426 (quit |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1427 ;; The user hit C-g while we were waiting: kill the process, in case |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1428 ;; it's a gnutls-cli process that's stuck (tends to happen a lot behind |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1429 ;; NAT routers). |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1430 (delete-process process) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1431 nil)))) |
31717 | 1432 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1433 (defun nnimap-parse-response () |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1434 (let ((lines (split-string (nnimap-last-response-string) "\r\n" t)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1435 result) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1436 (dolist (line lines) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1437 (push (cdr (nnimap-parse-line line)) result)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1438 ;; Return the OK/error code first, and then all the "continuation |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1439 ;; lines" afterwards. |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1440 (cons (pop result) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1441 (nreverse result)))) |
31717 | 1442 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1443 ;; Parse an IMAP response line lightly. They look like |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1444 ;; "* OK [UIDVALIDITY 1164213559] UIDs valid", typically, so parse |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1445 ;; the lines into a list of strings and lists of string. |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1446 (defun nnimap-parse-line (line) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1447 (let (char result) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1448 (with-temp-buffer |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1449 (insert line) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1450 (goto-char (point-min)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1451 (while (not (eobp)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1452 (if (eql (setq char (following-char)) ? ) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1453 (forward-char 1) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1454 (push |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1455 (cond |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1456 ((eql char ?\[) |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1457 (split-string |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1458 (buffer-substring |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1459 (1+ (point)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1460 (1- (search-forward "]" (line-end-position) 'move))))) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1461 ((eql char ?\() |
110898
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1462 (split-string |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1463 (buffer-substring |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1464 (1+ (point)) |
069deed4cdec
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110810
diff
changeset
|
1465 (1- (search-forward ")" (line-end-position) 'move))))) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1466 ((eql char ?\") |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1467 (forward-char 1) |
110615
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
1468 (buffer-substring |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
1469 (point) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
1470 (1- (or (search-forward "\"" (line-end-position) 'move) |
84a76c5e1b1c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110605
diff
changeset
|
1471 (point))))) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1472 (t |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1473 (buffer-substring (point) (if (search-forward " " nil t) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1474 (1- (point)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1475 (goto-char (point-max)))))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1476 result))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1477 (nreverse result)))) |
31717 | 1478 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1479 (defun nnimap-last-response-string () |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1480 (save-excursion |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1481 (forward-line 1) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1482 (let ((end (point))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1483 (forward-line -1) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1484 (when (not (bobp)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1485 (forward-line -1) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1486 (while (and (not (bobp)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1487 (eql (following-char) ?*)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1488 (forward-line -1)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1489 (unless (eql (following-char) ?*) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1490 (forward-line 1))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1491 (buffer-substring (point) end)))) |
31717 | 1492 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1493 (defun nnimap-get-responses (sequences) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1494 (let (responses) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1495 (dolist (sequence sequences) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1496 (goto-char (point-min)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1497 (when (re-search-forward (format "^%d " sequence) nil t) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1498 (push (list sequence (nnimap-parse-response)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1499 responses))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1500 responses)) |
31717 | 1501 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1502 (defvar nnimap-incoming-split-list nil) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56280
diff
changeset
|
1503 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1504 (defun nnimap-fetch-inbox (articles) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1505 (erase-buffer) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1506 (nnimap-wait-for-response |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1507 (nnimap-send-command |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1508 "UID FETCH %s %s" |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1509 (nnimap-article-ranges articles) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1510 (format "(UID %s%s)" |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1511 (format |
110583
b6d2a63ad993
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110568
diff
changeset
|
1512 (if (nnimap-ver4-p) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1513 "BODY.PEEK[HEADER] BODY.PEEK" |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1514 "RFC822.PEEK")) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1515 (if nnimap-split-download-body-default |
110451
4b82113fd203
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110433
diff
changeset
|
1516 "[]" |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1517 "[1]"))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1518 t)) |
31717 | 1519 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1520 (defun nnimap-split-incoming-mail () |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1521 (with-current-buffer (nnimap-buffer) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1522 (let ((nnimap-incoming-split-list nil) |
110661
2b8ece636433
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110633
diff
changeset
|
1523 (nnmail-split-methods (if (eq nnimap-split-methods 'default) |
2b8ece636433
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110633
diff
changeset
|
1524 nnmail-split-methods |
2b8ece636433
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110633
diff
changeset
|
1525 nnimap-split-methods)) |
110666
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
1526 (nnmail-split-fancy (or nnimap-split-fancy |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
1527 nnmail-split-fancy)) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1528 (nnmail-inhibit-default-split-group t) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1529 (groups (nnimap-get-groups)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1530 new-articles) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1531 (erase-buffer) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1532 (nnimap-command "SELECT %S" nnimap-inbox) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1533 (setq new-articles (nnimap-new-articles (nnimap-get-flags "1:*"))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1534 (when new-articles |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1535 (nnimap-fetch-inbox new-articles) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1536 (nnimap-transform-split-mail) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1537 (nnheader-ms-strip-cr) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1538 (nnmail-cache-open) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1539 (nnmail-split-incoming (current-buffer) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1540 #'nnimap-save-mail-spec |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1541 nil nil |
110486
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1542 #'nnimap-dummy-active-number |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1543 #'nnimap-save-mail-spec) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1544 (when nnimap-incoming-split-list |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1545 (let ((specs (nnimap-make-split-specs nnimap-incoming-split-list)) |
110486
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1546 sequences junk-articles) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1547 ;; Create any groups that doesn't already exist on the |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1548 ;; server first. |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1549 (dolist (spec specs) |
110486
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1550 (when (and (not (member (car spec) groups)) |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1551 (not (eq (car spec) 'junk))) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1552 (nnimap-command "CREATE %S" (utf7-encode (car spec) t)))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1553 ;; Then copy over all the messages. |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1554 (erase-buffer) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1555 (dolist (spec specs) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1556 (let ((group (car spec)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1557 (ranges (cdr spec))) |
110486
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1558 (if (eq group 'junk) |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1559 (setq junk-articles ranges) |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1560 (push (list (nnimap-send-command |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1561 "UID COPY %s %S" |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1562 (nnimap-article-ranges ranges) |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1563 (utf7-encode group t)) |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1564 ranges) |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1565 sequences)))) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1566 ;; Wait for the last COPY response... |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1567 (when sequences |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1568 (nnimap-wait-for-response (caar sequences)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1569 ;; And then mark the successful copy actions as deleted, |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1570 ;; and possibly expunge them. |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1571 (nnimap-mark-and-expunge-incoming |
110555
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
1572 (nnimap-parse-copied-articles sequences))) |
e07971bb896c
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
1573 (nnimap-mark-and-expunge-incoming junk-articles))))))) |
31717 | 1574 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1575 (defun nnimap-mark-and-expunge-incoming (range) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1576 (when range |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1577 (setq range (nnimap-article-ranges range)) |
110661
2b8ece636433
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110633
diff
changeset
|
1578 (erase-buffer) |
110465
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
1579 (let ((sequence |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
1580 (nnimap-send-command |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
1581 "UID STORE %s +FLAGS.SILENT (\\Deleted)" range))) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
1582 (cond |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
1583 ;; If the server supports it, we now delete the message we have |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
1584 ;; just copied over. |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
1585 ((member "UIDPLUS" (nnimap-capabilities nnimap-object)) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
1586 (setq sequence (nnimap-send-command "UID EXPUNGE %s" range))) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
1587 ;; If it doesn't support UID EXPUNGE, then we only expunge if the |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
1588 ;; user has configured it. |
110486
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1589 (nnimap-expunge |
110465
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
1590 (setq sequence (nnimap-send-command "EXPUNGE")))) |
b7b7e970d807
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110451
diff
changeset
|
1591 (nnimap-wait-for-response sequence)))) |
31717 | 1592 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1593 (defun nnimap-parse-copied-articles (sequences) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1594 (let (sequence copied range) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1595 (goto-char (point-min)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1596 (while (re-search-forward "^\\([0-9]+\\) OK " nil t) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1597 (setq sequence (string-to-number (match-string 1))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1598 (when (setq range (cadr (assq sequence sequences))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1599 (push (gnus-uncompress-range range) copied))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1600 (gnus-compress-sequence (sort (apply #'nconc copied) #'<)))) |
31717 | 1601 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1602 (defun nnimap-new-articles (flags) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1603 (let (new) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1604 (dolist (elem flags) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1605 (when (or (null (cdr elem)) |
110486
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1606 (and (not (memq '%Deleted (cdr elem))) |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1607 (not (memq '%Seen (cdr elem))))) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1608 (push (car elem) new))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1609 (gnus-compress-sequence (nreverse new)))) |
31717 | 1610 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1611 (defun nnimap-make-split-specs (list) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1612 (let ((specs nil) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1613 entry) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1614 (dolist (elem list) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1615 (destructuring-bind (article spec) elem |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1616 (dolist (group (delete nil (mapcar #'car spec))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1617 (unless (setq entry (assoc group specs)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1618 (push (setq entry (list group)) specs)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1619 (setcdr entry (cons article (cdr entry)))))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1620 (dolist (entry specs) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1621 (setcdr entry (gnus-compress-sequence (sort (cdr entry) #'<)))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1622 specs)) |
31717 | 1623 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1624 (defun nnimap-transform-split-mail () |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1625 (goto-char (point-min)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1626 (let (article bytes) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1627 (block nil |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1628 (while (not (eobp)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1629 (while (not (looking-at "^\\* [0-9]+ FETCH.*UID \\([0-9]+\\)")) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1630 (delete-region (point) (progn (forward-line 1) (point))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1631 (when (eobp) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1632 (return))) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1633 (setq article (match-string 1) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1634 bytes (nnimap-get-length)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1635 (delete-region (line-beginning-position) (line-end-position)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1636 ;; Insert MMDF separator, and a way to remember what this |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1637 ;; article UID is. |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1638 (insert (format "\^A\^A\^A\^A\n\nX-nnimap-article: %s" article)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1639 (forward-char (1+ bytes)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1640 (setq bytes (nnimap-get-length)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1641 (delete-region (line-beginning-position) (line-end-position)) |
110917
3243e7055d49
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110908
diff
changeset
|
1642 ;; There's a body; skip past that. |
3243e7055d49
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110908
diff
changeset
|
1643 (when bytes |
3243e7055d49
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110908
diff
changeset
|
1644 (forward-char (1+ bytes)) |
3243e7055d49
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110908
diff
changeset
|
1645 (delete-region (line-beginning-position) (line-end-position))))))) |
31717 | 1646 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1647 (defun nnimap-dummy-active-number (group &optional server) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1648 1) |
31717 | 1649 |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1650 (defun nnimap-save-mail-spec (group-art &optional server full-nov) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1651 (let (article) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1652 (goto-char (point-min)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1653 (if (not (re-search-forward "X-nnimap-article: \\([0-9]+\\)" nil t)) |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1654 (error "Invalid nnimap mail") |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1655 (setq article (string-to-number (match-string 1)))) |
110486
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1656 (push (list article |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1657 (if (eq group-art 'junk) |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1658 (list (cons 'junk 1)) |
1ad1adb298a3
Merge Changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110479
diff
changeset
|
1659 group-art)) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110219
diff
changeset
|
1660 nnimap-incoming-split-list))) |
31717 | 1661 |
1662 (provide 'nnimap) | |
1663 | |
1664 ;;; nnimap.el ends here |