annotate lisp/gnus/nnimap.el @ 111430:b75e6634a171

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