Mercurial > emacs
annotate lisp/gnus/nntp.el @ 111855:c587007a09f2
gnus-demon.el (gnus-demon-init): Call run-with-timer with time as argument, not t. XEmacs does not support that.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Wed, 08 Dec 2010 22:16:36 +0000 |
parents | 79219ca01c7b |
children | a264bb877bc7 |
rev | line source |
---|---|
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1 ;;; nntp.el --- nntp access for Gnus |
49993
a40d0a292281
* nnfolder.el (nnfolder-request-accept-article): Don't use
ShengHuo ZHU <zsh@cs.rochester.edu>
parents:
49725
diff
changeset
|
2 |
111299 | 3 ;; Copyright (C) 1987, 1988, 1989, 1990, 1992, 1993, 1994, 1995, 1996, |
4 ;; 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, | |
5 ;; 2009, 2010 Free Software Foundation, Inc. | |
17493 | 6 |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
7 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> |
17493 | 8 ;; Keywords: news |
9 | |
10 ;; This file is part of GNU Emacs. | |
11 | |
94662
f42ef85caf91
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93419
diff
changeset
|
12 ;; GNU Emacs is free software: you can redistribute it and/or modify |
f42ef85caf91
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93419
diff
changeset
|
13 ;; it under the terms of the GNU General Public License as published by |
f42ef85caf91
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93419
diff
changeset
|
14 ;; 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:
93419
diff
changeset
|
15 ;; (at your option) any later version. |
17493 | 16 |
94662
f42ef85caf91
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93419
diff
changeset
|
17 ;; GNU Emacs is distributed in the hope that it will be useful, |
f42ef85caf91
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93419
diff
changeset
|
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
f42ef85caf91
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93419
diff
changeset
|
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
f42ef85caf91
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93419
diff
changeset
|
20 ;; GNU General Public License for more details. |
17493 | 21 |
22 ;; 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:
93419
diff
changeset
|
23 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
17493 | 24 |
25 ;;; Commentary: | |
26 | |
27 ;;; Code: | |
28 | |
110918
236342431786
nnimap.el (gnutls-negotiate): Silence the byte compiler.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110666
diff
changeset
|
29 ;; For Emacs <22.2 and XEmacs. |
107427
ecbe0edc4f69
Stop message.el from loading about 40 libraries it doesn't always need.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
30 (eval-and-compile |
ecbe0edc4f69
Stop message.el from loading about 40 libraries it doesn't always need.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
31 (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))) |
ecbe0edc4f69
Stop message.el from loading about 40 libraries it doesn't always need.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
32 |
17493 | 33 (require 'nnheader) |
34 (require 'nnoo) | |
35 (require 'gnus-util) | |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
36 (require 'gnus) |
111789
f97704487fb3
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111721
diff
changeset
|
37 (require 'proto-stream) |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
38 (require 'gnus-group) ;; gnus-group-name-charset |
17493 | 39 |
40 (nnoo-declare nntp) | |
41 | |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
42 (eval-when-compile (require 'cl)) |
17493 | 43 |
95820
645fb33380d6
Remove unnecessary eval-and-compile of autoloads.
Glenn Morris <rgm@gnu.org>
parents:
94837
diff
changeset
|
44 (autoload 'auth-source-user-or-password "auth-source") |
94837 | 45 |
57015
6d1f39d4f8e6
* nntp.el (nntp): New customization group.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
56927
diff
changeset
|
46 (defgroup nntp nil |
6d1f39d4f8e6
* nntp.el (nntp): New customization group.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
56927
diff
changeset
|
47 "NNTP access for Gnus." |
6d1f39d4f8e6
* nntp.el (nntp): New customization group.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
56927
diff
changeset
|
48 :group 'gnus) |
6d1f39d4f8e6
* nntp.el (nntp): New customization group.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
56927
diff
changeset
|
49 |
17493 | 50 (defvoo nntp-address nil |
51 "Address of the physical nntp server.") | |
52 | |
53 (defvoo nntp-port-number "nntp" | |
54 "Port number on the physical nntp server.") | |
55 | |
56 (defvoo nntp-server-opened-hook '(nntp-send-mode-reader) | |
57 "*Hook used for sending commands to the server at startup. | |
58 The default value is `nntp-send-mode-reader', which makes an innd | |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
59 server spawn an nnrpd server.") |
17493 | 60 |
61 (defvoo nntp-authinfo-function 'nntp-send-authinfo | |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
62 "Function used to send AUTHINFO to the server. |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
63 It is called with no parameters.") |
17493 | 64 |
65 (defvoo nntp-server-action-alist | |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
66 '(("nntpd 1\\.5\\.11t" |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
67 (remove-hook 'nntp-server-opened-hook 'nntp-send-mode-reader)) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
68 ("NNRP server Netscape" |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
69 (setq nntp-server-list-active-group nil))) |
17493 | 70 "Alist of regexps to match on server types and actions to be taken. |
71 For instance, if you want Gnus to beep every time you connect | |
72 to innd, you could say something like: | |
73 | |
74 \(setq nntp-server-action-alist | |
75 '((\"innd\" (ding)))) | |
76 | |
77 You probably don't want to do that, though.") | |
78 | |
79 (defvoo nntp-open-connection-function 'nntp-open-network-stream | |
80 "*Function used for connecting to a remote system. | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
81 It will be called with the buffer to output in as argument. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
82 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
83 Currently, five such functions are provided (please refer to their |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
84 respective doc string for more information), three of them establishing |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
85 direct connections to the nntp server, and two of them using an indirect |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
86 host. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
87 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
88 Direct connections: |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
89 - `nntp-open-network-stream' (the default), |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
90 - `nntp-open-ssl-stream', |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
91 - `nntp-open-tls-stream', |
93419
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
92 - `nntp-open-netcat-stream'. |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
93 - `nntp-open-telnet-stream'. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
94 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
95 Indirect connections: |
93419
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
96 - `nntp-open-via-rlogin-and-netcat', |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
97 - `nntp-open-via-rlogin-and-telnet', |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
98 - `nntp-open-via-telnet-and-telnet'.") |
17493 | 99 |
76267 | 100 (defvoo nntp-never-echoes-commands nil |
101 "*Non-nil means the nntp server never echoes commands. | |
102 It is reported that some nntps server doesn't echo commands. So, you | |
103 may want to set this to non-nil in the method for such a server setting | |
104 `nntp-open-connection-function' to `nntp-open-ssl-stream' for example. | |
105 Note that the `nntp-open-connection-functions-never-echo-commands' | |
106 variable overrides the nil value of this variable.") | |
107 | |
108 (defvoo nntp-open-connection-functions-never-echo-commands | |
109 '(nntp-open-network-stream) | |
110 "*List of functions that never echo commands. | |
111 Add or set a function which you set to `nntp-open-connection-function' | |
112 to this list if it does not echo commands. Note that a non-nil value | |
113 of the `nntp-never-echoes-commands' variable overrides this variable.") | |
114 | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
115 (defvoo nntp-pre-command nil |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
116 "*Pre-command to use with the various nntp-open-via-* methods. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
117 This is where you would put \"runsocks\" or stuff like that.") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
118 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
119 (defvoo nntp-telnet-command "telnet" |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
120 "*Telnet command used to connect to the nntp server. |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
121 This command is used by the methods `nntp-open-telnet-stream', |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
122 `nntp-open-via-rlogin-and-telnet' and `nntp-open-via-telnet-and-telnet'.") |
17493 | 123 |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
124 (defvoo nntp-telnet-switches '("-8") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
125 "*Switches given to the telnet command `nntp-telnet-command'.") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
126 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
127 (defvoo nntp-end-of-line "\r\n" |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
128 "*String to use on the end of lines when talking to the NNTP server. |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
129 This is \"\\r\\n\" by default, but should be \"\\n\" when using an indirect |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
130 connection method (nntp-open-via-*).") |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
131 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
132 (defvoo nntp-via-rlogin-command "rsh" |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
133 "*Rlogin command used to connect to an intermediate host. |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
134 This command is used by the methods `nntp-open-via-rlogin-and-telnet' |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
135 and `nntp-open-via-rlogin-and-netcat'. The default is \"rsh\", but \"ssh\" |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
136 is a popular alternative.") |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
137 |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
138 (defvoo nntp-via-rlogin-command-switches nil |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
139 "*Switches given to the rlogin command `nntp-via-rlogin-command'. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
140 If you use \"ssh\" for `nntp-via-rlogin-command', you may set this to |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
141 \(\"-C\") in order to compress all data connections, otherwise set this |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
142 to \(\"-t\" \"-e\" \"none\") or (\"-C\" \"-t\" \"-e\" \"none\") if the telnet |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
143 command requires a pseudo-tty allocation on an intermediate host.") |
17493 | 144 |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
145 (defvoo nntp-via-telnet-command "telnet" |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
146 "*Telnet command used to connect to an intermediate host. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
147 This command is used by the `nntp-open-via-telnet-and-telnet' method.") |
17493 | 148 |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
149 (defvoo nntp-via-telnet-switches '("-8") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
150 "*Switches given to the telnet command `nntp-via-telnet-command'.") |
17493 | 151 |
93419
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
152 (defvoo nntp-netcat-command "nc" |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
153 "*Netcat command used to connect to the nntp server. |
93419
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
154 This command is used by the `nntp-open-netcat-stream' and |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
155 `nntp-open-via-rlogin-and-netcat' methods.") |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
156 |
93419
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
157 (defvoo nntp-netcat-switches nil |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
158 "*Switches given to the netcat command `nntp-netcat-command'.") |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
159 |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
160 (defvoo nntp-via-user-name nil |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
161 "*User name to log in on an intermediate host with. |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
162 This variable is used by the various nntp-open-via-* methods.") |
17493 | 163 |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
164 (defvoo nntp-via-user-password nil |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
165 "*Password to use to log in on an intermediate host with. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
166 This variable is used by the `nntp-open-via-telnet-and-telnet' method.") |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
167 |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
168 (defvoo nntp-via-address nil |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
169 "*Address of an intermediate host to connect to. |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
170 This variable is used by the various nntp-open-via-* methods.") |
19969
5f1ab3dd344d
*** empty log message ***
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
19598
diff
changeset
|
171 |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
172 (defvoo nntp-via-envuser nil |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
173 "*Whether both telnet client and server support the ENVIRON option. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
174 If non-nil, there will be no prompt for a login name.") |
19969
5f1ab3dd344d
*** empty log message ***
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
19598
diff
changeset
|
175 |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
176 (defvoo nntp-via-shell-prompt "bash\\|\$ *\r?$\\|> *\r?" |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
177 "*Regular expression to match the shell prompt on an intermediate host. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
178 This variable is used by the `nntp-open-via-telnet-and-telnet' method.") |
17493 | 179 |
180 (defvoo nntp-large-newsgroup 50 | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
181 "*The number of articles which indicates a large newsgroup. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
182 If the number of articles is greater than the value, verbose |
17493 | 183 messages will be shown to indicate the current status.") |
184 | |
185 (defvoo nntp-maximum-request 400 | |
186 "*The maximum number of the requests sent to the NNTP server at one time. | |
187 If Emacs hangs up while retrieving headers, set the variable to a | |
188 lower value.") | |
189 | |
190 (defvoo nntp-nov-is-evil nil | |
191 "*If non-nil, nntp will never attempt to use XOVER when talking to the server.") | |
192 | |
193 (defvoo nntp-xover-commands '("XOVER" "XOVERVIEW") | |
194 "*List of strings that are used as commands to fetch NOV lines from a server. | |
195 The strings are tried in turn until a positive response is gotten. If | |
196 none of the commands are successful, nntp will just grab headers one | |
197 by one.") | |
198 | |
19969
5f1ab3dd344d
*** empty log message ***
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
19598
diff
changeset
|
199 (defvoo nntp-nov-gap 5 |
17493 | 200 "*Maximum allowed gap between two articles. |
201 If the gap between two consecutive articles is bigger than this | |
202 variable, split the XOVER request into two requests.") | |
203 | |
78546 | 204 (defvoo nntp-xref-number-is-evil nil |
205 "*If non-nil, Gnus never trusts article numbers in the Xref header. | |
206 Some news servers, e.g., ones running Diablo, run multiple engines | |
207 having the same articles but article numbers are not kept synchronized | |
208 between them. If you connect to such a server, set this to a non-nil | |
209 value, and Gnus never uses article numbers (that appear in the Xref | |
210 header and vary by which engine is chosen) to refer to articles.") | |
211 | |
17493 | 212 (defvoo nntp-prepare-server-hook nil |
213 "*Hook run before a server is opened. | |
214 If can be used to set up a server remotely, for instance. Say you | |
215 have an account at the machine \"other.machine\". This machine has | |
216 access to an NNTP server that you can't access locally. You could | |
217 then use this hook to rsh to the remote machine and start a proxy NNTP | |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
218 server there that you can connect to. See also |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
219 `nntp-open-connection-function'") |
17493 | 220 |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
221 (defvoo nntp-coding-system-for-read 'binary |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
222 "*Coding system to read from NNTP.") |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
223 |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
224 (defvoo nntp-coding-system-for-write 'binary |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
225 "*Coding system to write to NNTP.") |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
226 |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
227 ;; Marks |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
228 (defvoo nntp-marks-is-evil nil |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
229 "*If non-nil, Gnus will never generate and use marks file for nntp groups. |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
230 See `nnml-marks-is-evil' for more information.") |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
231 |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
232 (defvoo nntp-marks-file-name ".marks") |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
233 (defvoo nntp-marks nil) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
234 (defvar nntp-marks-modtime (gnus-make-hashtable)) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
235 |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
236 (defcustom nntp-marks-directory |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
237 (nnheader-concat gnus-directory "marks/") |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
238 "*The directory where marks for nntp groups will be stored." |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
239 :group 'nntp |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
240 :type 'directory) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
241 |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
242 (defcustom nntp-authinfo-file "~/.authinfo" |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
243 ".netrc-like file that holds nntp authinfo passwords." |
57015
6d1f39d4f8e6
* nntp.el (nntp): New customization group.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
56927
diff
changeset
|
244 :group 'nntp |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
245 :type |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
246 '(choice file |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
247 (repeat :tag "Entries" |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
248 :menu-tag "Inline" |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
249 (list :format "%v" |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
250 :value ("" ("login" . "") ("password" . "")) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
251 (string :tag "Host") |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
252 (checklist :inline t |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
253 (cons :format "%v" |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
254 (const :format "" "login") |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
255 (string :format "Login: %v")) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
256 (cons :format "%v" |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
257 (const :format "" "password") |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
258 (string :format "Password: %v"))))))) |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
259 |
17493 | 260 |
261 | |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
262 (defvoo nntp-connection-timeout nil |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
263 "*Number of seconds to wait before an nntp connection times out. |
33575
93288a69f66f
2000-11-17 Katsumi Yamaoka <yamaoka@jpl.org>
Dave Love <fx@gnu.org>
parents:
31716
diff
changeset
|
264 If this variable is nil, which is the default, no timers are set. |
93288a69f66f
2000-11-17 Katsumi Yamaoka <yamaoka@jpl.org>
Dave Love <fx@gnu.org>
parents:
31716
diff
changeset
|
265 NOTE: This variable is never seen to work in Emacs 20 and XEmacs 21.") |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
266 |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
267 (defvoo nntp-prepare-post-hook nil |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
268 "*Hook run just before posting an article. It is supposed to be used |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
269 to insert Cancel-Lock headers.") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
270 |
110666
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
271 (defvoo nntp-server-list-active-group 'try |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
272 "If nil, then always use GROUP instead of LIST ACTIVE. |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
273 This is usually slower, but on misconfigured servers that don't |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
274 update their active files often, this can help.") |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110516
diff
changeset
|
275 |
17493 | 276 ;;; Internal variables. |
277 | |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
278 (defvar nntp-record-commands nil |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
279 "*If non-nil, nntp will record all commands in the \"*nntp-log*\" buffer.") |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
280 |
17493 | 281 (defvar nntp-have-messaged nil) |
282 | |
283 (defvar nntp-process-wait-for nil) | |
284 (defvar nntp-process-to-buffer nil) | |
285 (defvar nntp-process-callback nil) | |
286 (defvar nntp-process-decode nil) | |
287 (defvar nntp-process-start-point nil) | |
288 (defvar nntp-inside-change-function nil) | |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
289 (defvoo nntp-last-command-time nil) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
290 (defvoo nntp-last-command nil) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
291 (defvoo nntp-authinfo-password nil) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
292 (defvoo nntp-authinfo-user nil) |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
293 (defvoo nntp-authinfo-force nil) |
17493 | 294 |
295 (defvar nntp-connection-list nil) | |
296 | |
297 (defvoo nntp-server-type nil) | |
298 (defvoo nntp-connection-alist nil) | |
299 (defvoo nntp-status-string "") | |
300 (defconst nntp-version "nntp 5.0") | |
301 (defvoo nntp-inhibit-erase nil) | |
302 (defvoo nntp-inhibit-output nil) | |
303 | |
304 (defvoo nntp-server-xover 'try) | |
305 | |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
306 (defvar nntp-async-timer nil) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
307 (defvar nntp-async-process-list nil) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
308 |
67418
28264c86d408
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668
Miles Bader <miles@gnu.org>
parents:
65742
diff
changeset
|
309 (defvar nntp-authinfo-rejected nil |
110111
5b9f64b04a04
Delete all trailing white space.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110109
diff
changeset
|
310 "A custom error condition used to report 'Authentication Rejected' errors. |
5b9f64b04a04
Delete all trailing white space.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110109
diff
changeset
|
311 Condition handlers that match just this condition ensure that the nntp |
67418
28264c86d408
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668
Miles Bader <miles@gnu.org>
parents:
65742
diff
changeset
|
312 backend doesn't catch this error.") |
28264c86d408
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668
Miles Bader <miles@gnu.org>
parents:
65742
diff
changeset
|
313 (put 'nntp-authinfo-rejected 'error-conditions '(error nntp-authinfo-rejected)) |
28264c86d408
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668
Miles Bader <miles@gnu.org>
parents:
65742
diff
changeset
|
314 (put 'nntp-authinfo-rejected 'error-message "Authorization Rejected") |
28264c86d408
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668
Miles Bader <miles@gnu.org>
parents:
65742
diff
changeset
|
315 |
17493 | 316 |
317 | |
318 ;;; Internal functions. | |
319 | |
320 (defsubst nntp-send-string (process string) | |
321 "Send STRING to PROCESS." | |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
322 ;; We need to store the time to provide timeouts, and |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
323 ;; to store the command so the we can replay the command |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
324 ;; if the server gives us an AUTHINFO challenge. |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
325 (setq nntp-last-command-time (current-time) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
326 nntp-last-command string) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
327 (when nntp-record-commands |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
328 (nntp-record-command string)) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
329 (process-send-string process (concat string nntp-end-of-line)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
330 (or (memq (process-status process) '(open run)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
331 (nntp-report "Server closed connection"))) |
17493 | 332 |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
333 (defun nntp-record-command (string) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
334 "Record the command STRING." |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
335 (with-current-buffer (get-buffer-create "*nntp-log*") |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
336 (goto-char (point-max)) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
337 (let ((time (current-time))) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
338 (insert (format-time-string "%Y%m%dT%H%M%S" time) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
339 "." (format "%03d" (/ (nth 2 time) 1000)) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
340 " " nntp-address " " string "\n")))) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
341 |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
342 (defun nntp-report (&rest args) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
343 "Report an error from the nntp backend. The first string in ARGS |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
344 can be a format string. For some commands, the failed command may be |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
345 retried once before actually displaying the error report." |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
346 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
347 (when nntp-record-commands |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
348 (nntp-record-command "*** CALLED nntp-report ***")) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
349 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
350 (nnheader-report 'nntp args) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
351 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
352 (apply 'error args)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
353 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
354 (defun nntp-report-1 (&rest args) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
355 "Throws out to nntp-with-open-group-error so that the connection may |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
356 be restored and the command retried." |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
357 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
358 (when nntp-record-commands |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
359 (nntp-record-command "*** CONNECTION LOST ***")) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
360 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
361 (throw 'nntp-with-open-group-error t)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
362 |
86225 | 363 (defmacro nntp-insert-buffer-substring (buffer &optional start end) |
364 "Copy string from unibyte buffer to multibyte current buffer." | |
365 (if (featurep 'xemacs) | |
366 `(insert-buffer-substring ,buffer ,start ,end) | |
367 `(if enable-multibyte-characters | |
368 (insert (with-current-buffer ,buffer | |
369 (mm-string-to-multibyte | |
370 ,(if (or start end) | |
371 `(buffer-substring (or ,start (point-min)) | |
372 (or ,end (point-max))) | |
373 '(buffer-string))))) | |
374 (insert-buffer-substring ,buffer ,start ,end)))) | |
375 | |
376 (defmacro nntp-copy-to-buffer (buffer start end) | |
377 "Copy string from unibyte current buffer to multibyte buffer." | |
378 (if (featurep 'xemacs) | |
379 `(copy-to-buffer ,buffer ,start ,end) | |
380 `(let ((string (buffer-substring ,start ,end))) | |
381 (with-current-buffer ,buffer | |
382 (erase-buffer) | |
383 (insert (if enable-multibyte-characters | |
384 (mm-string-to-multibyte string) | |
385 string)) | |
386 (goto-char (point-min)) | |
387 nil)))) | |
388 | |
17493 | 389 (defsubst nntp-wait-for (process wait-for buffer &optional decode discard) |
390 "Wait for WAIT-FOR to arrive from PROCESS." | |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
391 |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
392 (with-current-buffer (process-buffer process) |
17493 | 393 (goto-char (point-min)) |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
394 |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
395 (while (and (or (not (memq (char-after (point)) '(?2 ?3 ?4 ?5))) |
67418
28264c86d408
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668
Miles Bader <miles@gnu.org>
parents:
65742
diff
changeset
|
396 (looking-at "48[02]")) |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
397 (memq (process-status process) '(open run))) |
67418
28264c86d408
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668
Miles Bader <miles@gnu.org>
parents:
65742
diff
changeset
|
398 (cond ((looking-at "480") |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
399 (nntp-handle-authinfo process)) |
67418
28264c86d408
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668
Miles Bader <miles@gnu.org>
parents:
65742
diff
changeset
|
400 ((looking-at "482") |
111830
79219ca01c7b
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111789
diff
changeset
|
401 (nnheader-report 'nntp "%s" |
79219ca01c7b
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111789
diff
changeset
|
402 (get 'nntp-authinfo-rejected 'error-message)) |
67418
28264c86d408
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668
Miles Bader <miles@gnu.org>
parents:
65742
diff
changeset
|
403 (signal 'nntp-authinfo-rejected nil)) |
28264c86d408
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668
Miles Bader <miles@gnu.org>
parents:
65742
diff
changeset
|
404 ((looking-at "^.*\n") |
28264c86d408
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668
Miles Bader <miles@gnu.org>
parents:
65742
diff
changeset
|
405 (delete-region (point) (progn (forward-line 1) (point))))) |
17493 | 406 (nntp-accept-process-output process) |
407 (goto-char (point-min))) | |
408 (prog1 | |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
409 (cond |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
410 ((looking-at "[45]") |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
411 (progn |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
412 (nntp-snarf-error-message) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
413 nil)) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
414 ((not (memq (process-status process) '(open run))) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
415 (nntp-report "Server closed connection")) |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
416 (t |
17493 | 417 (goto-char (point-max)) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
418 (let ((limit (point-min)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
419 response) |
17493 | 420 (while (not (re-search-backward wait-for limit t)) |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
421 (nntp-accept-process-output process) |
17493 | 422 ;; We assume that whatever we wait for is less than 1000 |
423 ;; characters long. | |
424 (setq limit (max (- (point-max) 1000) (point-min))) | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
425 (goto-char (point-max))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
426 (setq response (match-string 0)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
427 (with-current-buffer nntp-server-buffer |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
428 (setq nntp-process-response response))) |
17493 | 429 (nntp-decode-text (not decode)) |
430 (unless discard | |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
431 (with-current-buffer buffer |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
432 (goto-char (point-max)) |
86225 | 433 (nntp-insert-buffer-substring (process-buffer process)) |
17493 | 434 ;; Nix out "nntp reading...." message. |
435 (when nntp-have-messaged | |
436 (setq nntp-have-messaged nil) | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
437 (nnheader-message 5 "")))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
438 t)) |
17493 | 439 (unless discard |
440 (erase-buffer))))) | |
441 | |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
442 (defun nntp-kill-buffer (buffer) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
443 (when (buffer-name buffer) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
444 (kill-buffer buffer) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
445 (nnheader-init-server-buffer))) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
446 |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
447 (defun nntp-erase-buffer (buffer) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
448 "Erase contents of BUFFER." |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
449 (with-current-buffer buffer |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
450 (erase-buffer))) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
451 |
17493 | 452 (defsubst nntp-find-connection (buffer) |
453 "Find the connection delivering to BUFFER." | |
454 (let ((alist nntp-connection-alist) | |
455 (buffer (if (stringp buffer) (get-buffer buffer) buffer)) | |
456 process entry) | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
457 (while (and alist (setq entry (pop alist))) |
17493 | 458 (when (eq buffer (cadr entry)) |
459 (setq process (car entry) | |
460 alist nil))) | |
461 (when process | |
462 (if (memq (process-status process) '(open run)) | |
463 process | |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
464 (nntp-kill-buffer (process-buffer process)) |
17493 | 465 (setq nntp-connection-alist (delq entry nntp-connection-alist)) |
466 nil)))) | |
467 | |
468 (defsubst nntp-find-connection-entry (buffer) | |
469 "Return the entry for the connection to BUFFER." | |
470 (assq (nntp-find-connection buffer) nntp-connection-alist)) | |
471 | |
472 (defun nntp-find-connection-buffer (buffer) | |
473 "Return the process connection buffer tied to BUFFER." | |
474 (let ((process (nntp-find-connection buffer))) | |
475 (when process | |
476 (process-buffer process)))) | |
477 | |
478 (defsubst nntp-retrieve-data (command address port buffer | |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
479 &optional wait-for callback decode) |
17493 | 480 "Use COMMAND to retrieve data into BUFFER from PORT on ADDRESS." |
481 (let ((process (or (nntp-find-connection buffer) | |
482 (nntp-open-connection buffer)))) | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
483 (if process |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
484 (progn |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
485 (unless (or nntp-inhibit-erase nnheader-callback-function) |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
486 (nntp-erase-buffer (process-buffer process))) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
487 (condition-case err |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
488 (progn |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
489 (when command |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
490 (nntp-send-string process command)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
491 (cond |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
492 ((eq callback 'ignore) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
493 t) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
494 ((and callback wait-for) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
495 (nntp-async-wait process wait-for buffer decode callback) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
496 t) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
497 (wait-for |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
498 (nntp-wait-for process wait-for buffer decode)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
499 (t t))) |
67418
28264c86d408
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668
Miles Bader <miles@gnu.org>
parents:
65742
diff
changeset
|
500 (nntp-authinfo-rejected |
28264c86d408
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668
Miles Bader <miles@gnu.org>
parents:
65742
diff
changeset
|
501 (signal 'nntp-authinfo-rejected (cdr err))) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
502 (error |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
503 (nnheader-report 'nntp "Couldn't open connection to %s: %s" |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
504 address err)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
505 (quit |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
506 (message "Quit retrieving data from nntp") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
507 (signal 'quit nil) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
508 nil))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
509 (nnheader-report 'nntp "Couldn't open connection to %s" address)))) |
17493 | 510 |
511 (defsubst nntp-send-command (wait-for &rest strings) | |
512 "Send STRINGS to server and wait until WAIT-FOR returns." | |
513 (when (and (not nnheader-callback-function) | |
514 (not nntp-inhibit-output)) | |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
515 (nntp-erase-buffer nntp-server-buffer)) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
516 (let* ((command (mapconcat 'identity strings " ")) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
517 (process (nntp-find-connection nntp-server-buffer)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
518 (buffer (and process (process-buffer process))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
519 (pos (and buffer (with-current-buffer buffer (point))))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
520 (if process |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
521 (prog1 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
522 (nntp-retrieve-data command |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
523 nntp-address nntp-port-number |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
524 nntp-server-buffer |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
525 wait-for nnheader-callback-function) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
526 ;; If nothing to wait for, still remove possibly echo'ed commands. |
76267 | 527 ;; We don't have echoes if `nntp-never-echoes-commands' is non-nil |
528 ;; or the value of `nntp-open-connection-function' is in | |
529 ;; `nntp-open-connection-functions-never-echo-commands', so we | |
530 ;; skip this in that cases. | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
531 (unless (or wait-for |
76267 | 532 nntp-never-echoes-commands |
533 (memq | |
534 nntp-open-connection-function | |
535 nntp-open-connection-functions-never-echo-commands)) | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
536 (nntp-accept-response) |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
537 (with-current-buffer buffer |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
538 (goto-char pos) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
539 (if (looking-at (regexp-quote command)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
540 (delete-region pos (progn (forward-line 1) |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
541 (point-at-bol))))))) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
542 (nnheader-report 'nntp "Couldn't open connection to %s." |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
543 nntp-address)))) |
17493 | 544 |
545 (defun nntp-send-command-nodelete (wait-for &rest strings) | |
546 "Send STRINGS to server and wait until WAIT-FOR returns." | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
547 (let* ((command (mapconcat 'identity strings " ")) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
548 (process (nntp-find-connection nntp-server-buffer)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
549 (buffer (and process (process-buffer process))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
550 (pos (and buffer (with-current-buffer buffer (point))))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
551 (if process |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
552 (prog1 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
553 (nntp-retrieve-data command |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
554 nntp-address nntp-port-number |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
555 nntp-server-buffer |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
556 wait-for nnheader-callback-function) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
557 ;; If nothing to wait for, still remove possibly echo'ed commands |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
558 (unless wait-for |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
559 (nntp-accept-response) |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
560 (with-current-buffer buffer |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
561 (goto-char pos) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
562 (if (looking-at (regexp-quote command)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
563 (delete-region pos (progn (forward-line 1) |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
564 (point-at-bol))))))) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
565 (nnheader-report 'nntp "Couldn't open connection to %s." |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
566 nntp-address)))) |
17493 | 567 |
568 (defun nntp-send-command-and-decode (wait-for &rest strings) | |
569 "Send STRINGS to server and wait until WAIT-FOR returns." | |
570 (when (and (not nnheader-callback-function) | |
571 (not nntp-inhibit-output)) | |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
572 (nntp-erase-buffer nntp-server-buffer)) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
573 (let* ((command (mapconcat 'identity strings " ")) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
574 (process (nntp-find-connection nntp-server-buffer)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
575 (buffer (and process (process-buffer process))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
576 (pos (and buffer (with-current-buffer buffer (point))))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
577 (if process |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
578 (prog1 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
579 (nntp-retrieve-data command |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
580 nntp-address nntp-port-number |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
581 nntp-server-buffer |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
582 wait-for nnheader-callback-function t) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
583 ;; If nothing to wait for, still remove possibly echo'ed commands |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
584 (unless wait-for |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
585 (nntp-accept-response) |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
586 (with-current-buffer buffer |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
587 (goto-char pos) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
588 (if (looking-at (regexp-quote command)) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
589 (delete-region pos (progn (forward-line 1) (point-at-bol)))) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
590 ))) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
591 (nnheader-report 'nntp "Couldn't open connection to %s." |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
592 nntp-address)))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
593 |
17493 | 594 |
595 (defun nntp-send-buffer (wait-for) | |
596 "Send the current buffer to server and wait until WAIT-FOR returns." | |
597 (when (and (not nnheader-callback-function) | |
598 (not nntp-inhibit-output)) | |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
599 (nntp-erase-buffer |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
600 (nntp-find-connection-buffer nntp-server-buffer))) |
17493 | 601 (nntp-encode-text) |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
602 ;; Make sure we did not forget to encode some of the content. |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
603 (assert (save-excursion (goto-char (point-min)) |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
604 (not (re-search-forward "[^\000-\377]" nil t)))) |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
605 (mm-disable-multibyte) |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
606 (process-send-region (nntp-find-connection nntp-server-buffer) |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
607 (point-min) (point-max)) |
17493 | 608 (nntp-retrieve-data |
609 nil nntp-address nntp-port-number nntp-server-buffer | |
610 wait-for nnheader-callback-function)) | |
611 | |
612 | |
613 | |
614 ;;; Interface functions. | |
615 | |
616 (nnoo-define-basics nntp) | |
617 | |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
618 (defsubst nntp-next-result-arrived-p () |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
619 (cond |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
620 ;; A result that starts with a 2xx code is terminated by |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
621 ;; a line with only a "." on it. |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
622 ((eq (char-after) ?2) |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
623 (if (re-search-forward "\n\\.\r?\n" nil t) |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
624 (progn |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
625 ;; Some broken news servers add another dot at the end. |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
626 ;; Protect against inflooping there. |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
627 (while (looking-at "^\\.\r?\n") |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
628 (forward-line 1)) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
629 t) |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
630 nil)) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
631 ;; A result that starts with a 3xx or 4xx code is terminated |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
632 ;; by a newline. |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
633 ((looking-at "[34]") |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
634 (if (search-forward "\n" nil t) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
635 t |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
636 nil)) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
637 ;; No result here. |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
638 (t |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
639 nil))) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
640 |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
641 (eval-when-compile |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
642 (defvar nntp-with-open-group-internal nil) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
643 (defvar nntp-report-n nil)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
644 |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
645 (defun nntp-with-open-group-function (-group -server -connectionless -bodyfun) |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
646 "Protect against servers that don't like clients that keep idle connections opens. |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
647 The problem being that these servers may either close a connection or |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
648 simply ignore any further requests on a connection. Closed |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
649 connections are not detected until `accept-process-output' has updated |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
650 the `process-status'. Dropped connections are not detected until the |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
651 connection timeouts (which may be several minutes) or |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
652 `nntp-connection-timeout' has expired. When these occur |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
653 `nntp-with-open-group', opens a new connection then re-issues the NNTP |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
654 command whose response triggered the error." |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
655 (letf ((nntp-report-n (symbol-function 'nntp-report)) |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
656 ((symbol-function 'nntp-report) (symbol-function 'nntp-report-1)) |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
657 (nntp-with-open-group-internal nil)) |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
658 (while (catch 'nntp-with-open-group-error |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
659 ;; Open the connection to the server |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
660 ;; NOTE: Existing connections are NOT tested. |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
661 (nntp-possibly-change-group -group -server -connectionless) |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
662 |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
663 (let ((-timer |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
664 (and nntp-connection-timeout |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
665 (run-at-time |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
666 nntp-connection-timeout nil |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
667 (lambda () |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
668 (let* ((-process (nntp-find-connection |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
669 nntp-server-buffer)) |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
670 (-buffer (and -process |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
671 (process-buffer -process)))) |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
672 ;; When I an able to identify the |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
673 ;; connection to the server AND I've |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
674 ;; received NO reponse for |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
675 ;; nntp-connection-timeout seconds. |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
676 (when (and -buffer (eq 0 (buffer-size -buffer))) |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
677 ;; Close the connection. Take no |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
678 ;; other action as the accept input |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
679 ;; code will handle the closed |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
680 ;; connection. |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
681 (nntp-kill-buffer -buffer)))))))) |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
682 (unwind-protect |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
683 (setq nntp-with-open-group-internal |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
684 (condition-case nil |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
685 (funcall -bodyfun) |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
686 (quit |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
687 (unless debug-on-quit |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
688 (nntp-close-server)) |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
689 (signal 'quit nil)))) |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
690 (when -timer |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
691 (nnheader-cancel-timer -timer))) |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
692 nil)) |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
693 (setf (symbol-function 'nntp-report) nntp-report-n)) |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
694 nntp-with-open-group-internal)) |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
695 |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
696 (defmacro nntp-with-open-group (group server &optional connectionless &rest forms) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
697 "Protect against servers that don't like clients that keep idle connections opens. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
698 The problem being that these servers may either close a connection or |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
699 simply ignore any further requests on a connection. Closed |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
700 connections are not detected until `accept-process-output' has updated |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
701 the `process-status'. Dropped connections are not detected until the |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
702 connection timeouts (which may be several minutes) or |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
703 `nntp-connection-timeout' has expired. When these occur |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
704 `nntp-with-open-group', opens a new connection then re-issues the NNTP |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
705 command whose response triggered the error." |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
706 (declare (indent 2) (debug (form form [&optional symbolp] def-body))) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
707 (when (and (listp connectionless) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
708 (not (eq connectionless nil))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
709 (setq forms (cons connectionless forms) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
710 connectionless nil)) |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
711 `(nntp-with-open-group-function ,group ,server ,connectionless (lambda () ,@forms))) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
712 |
17493 | 713 (deffoo nntp-retrieve-headers (articles &optional group server fetch-old) |
714 "Retrieve the headers of ARTICLES." | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
715 (nntp-with-open-group |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
716 group server |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
717 (with-current-buffer (nntp-find-connection-buffer nntp-server-buffer) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
718 (erase-buffer) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
719 (if (and (not gnus-nov-is-evil) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
720 (not nntp-nov-is-evil) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
721 (nntp-retrieve-headers-with-xover articles fetch-old)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
722 ;; We successfully retrieved the headers via XOVER. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
723 'nov |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
724 ;; XOVER didn't work, so we do it the hard, slow and inefficient |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
725 ;; way. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
726 (let ((number (length articles)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
727 (articles articles) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
728 (count 0) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
729 (received 0) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
730 (last-point (point-min)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
731 (buf (nntp-find-connection-buffer nntp-server-buffer)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
732 (nntp-inhibit-erase t) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
733 article) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
734 ;; Send HEAD commands. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
735 (while (setq article (pop articles)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
736 (nntp-send-command |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
737 nil |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
738 "HEAD" (if (numberp article) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
739 (int-to-string article) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
740 ;; `articles' is either a list of article numbers |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
741 ;; or a list of article IDs. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
742 article)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
743 (incf count) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
744 ;; Every 400 requests we have to read the stream in |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
745 ;; order to avoid deadlocks. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
746 (when (or (null articles) ;All requests have been sent. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
747 (zerop (% count nntp-maximum-request))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
748 (nntp-accept-response) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
749 (while (progn |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
750 (set-buffer buf) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
751 (goto-char last-point) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
752 ;; Count replies. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
753 (while (nntp-next-result-arrived-p) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
754 (setq last-point (point)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
755 (incf received)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
756 (< received count)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
757 ;; If number of headers is greater than 100, give |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
758 ;; informative messages. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
759 (and (numberp nntp-large-newsgroup) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
760 (> number nntp-large-newsgroup) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
761 (zerop (% received 20)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
762 (nnheader-message 6 "NNTP: Receiving headers... %d%%" |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
763 (/ (* received 100) number))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
764 (nntp-accept-response)))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
765 (and (numberp nntp-large-newsgroup) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
766 (> number nntp-large-newsgroup) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
767 (nnheader-message 6 "NNTP: Receiving headers...done")) |
17493 | 768 |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
769 ;; Now all of replies are received. Fold continuation lines. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
770 (nnheader-fold-continuation-lines) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
771 ;; Remove all "\r"'s. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
772 (nnheader-strip-cr) |
86225 | 773 (nntp-copy-to-buffer nntp-server-buffer (point-min) (point-max)) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
774 'headers))))) |
17493 | 775 |
776 (deffoo nntp-retrieve-groups (groups &optional server) | |
777 "Retrieve group info on GROUPS." | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
778 (nntp-with-open-group |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
779 nil server |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
780 (when (nntp-find-connection-buffer nntp-server-buffer) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
781 (catch 'done |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
782 (save-excursion |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
783 ;; Erase nntp-server-buffer before nntp-inhibit-erase. |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
784 (nntp-erase-buffer nntp-server-buffer) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
785 (set-buffer (nntp-find-connection-buffer nntp-server-buffer)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
786 ;; The first time this is run, this variable is `try'. So we |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
787 ;; try. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
788 (when (eq nntp-server-list-active-group 'try) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
789 (nntp-try-list-active (car groups))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
790 (erase-buffer) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
791 (let ((count 0) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
792 (groups groups) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
793 (received 0) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
794 (last-point (point-min)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
795 (nntp-inhibit-erase t) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
796 (buf (nntp-find-connection-buffer nntp-server-buffer)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
797 (command (if nntp-server-list-active-group |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
798 "LIST ACTIVE" "GROUP"))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
799 (while groups |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
800 ;; Timeout may have killed the buffer. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
801 (unless (gnus-buffer-live-p buf) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
802 (nnheader-report 'nntp "Connection to %s is closed." server) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
803 (throw 'done nil)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
804 ;; Send the command to the server. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
805 (nntp-send-command nil command (pop groups)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
806 (incf count) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
807 ;; Every 400 requests we have to read the stream in |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
808 ;; order to avoid deadlocks. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
809 (when (or (null groups) ;All requests have been sent. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
810 (zerop (% count nntp-maximum-request))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
811 (nntp-accept-response) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
812 (while (and (gnus-buffer-live-p buf) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
813 (progn |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
814 ;; Search `blue moon' in this file for the |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
815 ;; reason why set-buffer here. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
816 (set-buffer buf) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
817 (goto-char last-point) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
818 ;; Count replies. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
819 (while (re-search-forward "^[0-9]" nil t) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
820 (incf received)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
821 (setq last-point (point)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
822 (< received count))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
823 (nntp-accept-response)))) |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
824 |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
825 ;; Wait for the reply from the final command. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
826 (unless (gnus-buffer-live-p buf) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
827 (nnheader-report 'nntp "Connection to %s is closed." server) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
828 (throw 'done nil)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
829 (set-buffer buf) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
830 (goto-char (point-max)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
831 (re-search-backward "^[0-9]" nil t) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
832 (when (looking-at "^[23]") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
833 (while (and (gnus-buffer-live-p buf) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
834 (progn |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
835 (set-buffer buf) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
836 (goto-char (point-max)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
837 (if (not nntp-server-list-active-group) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
838 (not (re-search-backward "\r?\n" |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
839 (- (point) 3) t)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
840 (not (re-search-backward "^\\.\r?\n" |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
841 (- (point) 4) t))))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
842 (nntp-accept-response))) |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
843 |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
844 ;; Now all replies are received. We remove CRs. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
845 (unless (gnus-buffer-live-p buf) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
846 (nnheader-report 'nntp "Connection to %s is closed." server) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
847 (throw 'done nil)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
848 (set-buffer buf) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
849 (goto-char (point-min)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
850 (while (search-forward "\r" nil t) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
851 (replace-match "" t t)) |
17493 | 852 |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
853 (if (not nntp-server-list-active-group) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
854 (progn |
86225 | 855 (nntp-copy-to-buffer nntp-server-buffer |
856 (point-min) (point-max)) | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
857 'group) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
858 ;; We have read active entries, so we just delete the |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
859 ;; superfluous gunk. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
860 (goto-char (point-min)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
861 (while (re-search-forward "^[.2-5]" nil t) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
862 (delete-region (match-beginning 0) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
863 (progn (forward-line 1) (point)))) |
86225 | 864 (nntp-copy-to-buffer nntp-server-buffer (point-min) (point-max)) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
865 'active))))))) |
17493 | 866 |
867 (deffoo nntp-retrieve-articles (articles &optional group server) | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
868 (nntp-with-open-group |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
869 group server |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
870 (save-excursion |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
871 (let ((number (length articles)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
872 (articles articles) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
873 (count 0) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
874 (received 0) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
875 (last-point (point-min)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
876 (buf (nntp-find-connection-buffer nntp-server-buffer)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
877 (nntp-inhibit-erase t) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
878 (map (apply 'vector articles)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
879 (point 1) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
880 article) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
881 (set-buffer buf) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
882 (erase-buffer) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
883 ;; Send ARTICLE command. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
884 (while (setq article (pop articles)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
885 (nntp-send-command |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
886 nil |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
887 "ARTICLE" (if (numberp article) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
888 (int-to-string article) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
889 ;; `articles' is either a list of article numbers |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
890 ;; or a list of article IDs. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
891 article)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
892 (incf count) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
893 ;; Every 400 requests we have to read the stream in |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
894 ;; order to avoid deadlocks. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
895 (when (or (null articles) ;All requests have been sent. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
896 (zerop (% count nntp-maximum-request))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
897 (nntp-accept-response) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
898 (while (progn |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
899 (set-buffer buf) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
900 (goto-char last-point) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
901 ;; Count replies. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
902 (while (nntp-next-result-arrived-p) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
903 (aset map received (cons (aref map received) (point))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
904 (setq last-point (point)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
905 (incf received)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
906 (< received count)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
907 ;; If number of headers is greater than 100, give |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
908 ;; informative messages. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
909 (and (numberp nntp-large-newsgroup) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
910 (> number nntp-large-newsgroup) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
911 (zerop (% received 20)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
912 (nnheader-message 6 "NNTP: Receiving articles... %d%%" |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
913 (/ (* received 100) number))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
914 (nntp-accept-response)))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
915 (and (numberp nntp-large-newsgroup) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
916 (> number nntp-large-newsgroup) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
917 (nnheader-message 6 "NNTP: Receiving articles...done")) |
17493 | 918 |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
919 ;; Now we have all the responses. We go through the results, |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
920 ;; wash it and copy it over to the server buffer. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
921 (set-buffer nntp-server-buffer) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
922 (erase-buffer) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
923 (setq last-point (point-min)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
924 (mapcar |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
925 (lambda (entry) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
926 (narrow-to-region |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
927 (setq point (goto-char (point-max))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
928 (progn |
86225 | 929 (nntp-insert-buffer-substring buf last-point (cdr entry)) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
930 (point-max))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
931 (setq last-point (cdr entry)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
932 (nntp-decode-text) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
933 (widen) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
934 (cons (car entry) point)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
935 map))))) |
17493 | 936 |
937 (defun nntp-try-list-active (group) | |
938 (nntp-list-active-group group) | |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
939 (with-current-buffer nntp-server-buffer |
17493 | 940 (goto-char (point-min)) |
941 (cond ((or (eobp) | |
942 (looking-at "5[0-9]+")) | |
943 (setq nntp-server-list-active-group nil)) | |
944 (t | |
945 (setq nntp-server-list-active-group t))))) | |
946 | |
947 (deffoo nntp-list-active-group (group &optional server) | |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
948 "Return the active info on GROUP (which can be a regexp)." |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
949 (nntp-with-open-group |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
950 nil server |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
951 (nntp-send-command "^\\.*\r?\n" "LIST ACTIVE" group))) |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
952 |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
953 (deffoo nntp-request-group-articles (group &optional server) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
954 "Return the list of existing articles in GROUP." |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
955 (nntp-with-open-group |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
956 nil server |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
957 (nntp-send-command "^\\.*\r?\n" "LISTGROUP" group))) |
17493 | 958 |
959 (deffoo nntp-request-article (article &optional group server buffer command) | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
960 (nntp-with-open-group |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
961 group server |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
962 (when (nntp-send-command-and-decode |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
963 "\r?\n\\.\r?\n" "ARTICLE" |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
964 (if (numberp article) (int-to-string article) article)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
965 (if (and buffer |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
966 (not (equal buffer nntp-server-buffer))) |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
967 (with-current-buffer nntp-server-buffer |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
968 (copy-to-buffer buffer (point-min) (point-max)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
969 (nntp-find-group-and-number group)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
970 (nntp-find-group-and-number group))))) |
17493 | 971 |
972 (deffoo nntp-request-head (article &optional group server) | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
973 (nntp-with-open-group |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
974 group server |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
975 (when (nntp-send-command |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
976 "\r?\n\\.\r?\n" "HEAD" |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
977 (if (numberp article) (int-to-string article) article)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
978 (prog1 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
979 (nntp-find-group-and-number group) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
980 (nntp-decode-text))))) |
17493 | 981 |
982 (deffoo nntp-request-body (article &optional group server) | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
983 (nntp-with-open-group |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
984 group server |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
985 (nntp-send-command-and-decode |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
986 "\r?\n\\.\r?\n" "BODY" |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
987 (if (numberp article) (int-to-string article) article)))) |
17493 | 988 |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110410
diff
changeset
|
989 (deffoo nntp-request-group (group &optional server dont-check info) |
64754
fafd692d1e40
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64092
diff
changeset
|
990 (nntp-with-open-group |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
991 nil server |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
992 (when (nntp-send-command "^[245].*\n" "GROUP" group) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
993 (let ((entry (nntp-find-connection-entry nntp-server-buffer))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
994 (setcar (cddr entry) group))))) |
17493 | 995 |
996 (deffoo nntp-close-group (group &optional server) | |
997 t) | |
998 | |
999 (deffoo nntp-server-opened (&optional server) | |
1000 "Say whether a connection to SERVER has been opened." | |
1001 (and (nnoo-current-server-p 'nntp server) | |
1002 nntp-server-buffer | |
1003 (gnus-buffer-live-p nntp-server-buffer) | |
1004 (nntp-find-connection nntp-server-buffer))) | |
1005 | |
1006 (deffoo nntp-open-server (server &optional defs connectionless) | |
1007 (nnheader-init-server-buffer) | |
1008 (if (nntp-server-opened server) | |
1009 t | |
1010 (when (or (stringp (car defs)) | |
1011 (numberp (car defs))) | |
1012 (setq defs (cons (list 'nntp-port-number (car defs)) (cdr defs)))) | |
1013 (unless (assq 'nntp-address defs) | |
1014 (setq defs (append defs (list (list 'nntp-address server))))) | |
1015 (nnoo-change-server 'nntp server defs) | |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110257
diff
changeset
|
1016 (if connectionless |
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110257
diff
changeset
|
1017 t |
17493 | 1018 (or (nntp-find-connection nntp-server-buffer) |
1019 (nntp-open-connection nntp-server-buffer))))) | |
1020 | |
1021 (deffoo nntp-close-server (&optional server) | |
1022 (nntp-possibly-change-group nil server t) | |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1023 (let ((process (nntp-find-connection nntp-server-buffer))) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1024 (while process |
17493 | 1025 (when (memq (process-status process) '(open run)) |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1026 (ignore-errors |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1027 (nntp-send-string process "QUIT") |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1028 (unless (eq nntp-open-connection-function 'nntp-open-network-stream) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1029 ;; Ok, this is evil, but when using telnet and stuff |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1030 ;; as the connection method, it's important that the |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1031 ;; QUIT command actually is sent out before we kill |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1032 ;; the process. |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1033 (sleep-for 1)))) |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1034 (nntp-kill-buffer (process-buffer process)) |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1035 (setq process (car (pop nntp-connection-alist)))) |
17493 | 1036 (nnoo-close-server 'nntp))) |
1037 | |
1038 (deffoo nntp-request-close () | |
1039 (let (process) | |
1040 (while (setq process (pop nntp-connection-list)) | |
1041 (when (memq (process-status process) '(open run)) | |
1042 (ignore-errors | |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1043 (nntp-send-string process "QUIT") |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1044 (unless (eq nntp-open-connection-function 'nntp-open-network-stream) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1045 ;; Ok, this is evil, but when using telnet and stuff |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1046 ;; as the connection method, it's important that the |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1047 ;; QUIT command actually is sent out before we kill |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1048 ;; the process. |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1049 (sleep-for 1)))) |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1050 (nntp-kill-buffer (process-buffer process))))) |
17493 | 1051 |
1052 (deffoo nntp-request-list (&optional server) | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1053 (nntp-with-open-group |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1054 nil server |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1055 (nntp-send-command-and-decode "\r?\n\\.\r?\n" "LIST"))) |
17493 | 1056 |
1057 (deffoo nntp-request-list-newsgroups (&optional server) | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1058 (nntp-with-open-group |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1059 nil server |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1060 (nntp-send-command "\r?\n\\.\r?\n" "LIST NEWSGROUPS"))) |
17493 | 1061 |
1062 (deffoo nntp-request-newgroups (date &optional server) | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1063 (nntp-with-open-group |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1064 nil server |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1065 (with-current-buffer nntp-server-buffer |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1066 (let* ((time (date-to-time date)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1067 (ls (- (cadr time) (nth 8 (decode-time time))))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1068 (cond ((< ls 0) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1069 (setcar time (1- (car time))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1070 (setcar (cdr time) (+ ls 65536))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1071 ((>= ls 65536) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1072 (setcar time (1+ (car time))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1073 (setcar (cdr time) (- ls 65536))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1074 (t |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1075 (setcar (cdr time) ls))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1076 (prog1 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1077 (nntp-send-command |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1078 "^\\.\r?\n" "NEWGROUPS" |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1079 (format-time-string "%y%m%d %H%M%S" time) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1080 "GMT") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1081 (nntp-decode-text)))))) |
17493 | 1082 |
1083 (deffoo nntp-request-post (&optional server) | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1084 (nntp-with-open-group |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1085 nil server |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1086 (when (nntp-send-command "^[23].*\r?\n" "POST") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1087 (let ((response (with-current-buffer nntp-server-buffer |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1088 nntp-process-response)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1089 server-id) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1090 (when (and response |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1091 (string-match "^[23].*\\(<[^\t\n @<>]+@[^\t\n @<>]+>\\)" |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1092 response)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1093 (setq server-id (match-string 1 response)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1094 (narrow-to-region (goto-char (point-min)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1095 (if (search-forward "\n\n" nil t) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1096 (1- (point)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1097 (point-max))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1098 (unless (mail-fetch-field "Message-ID") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1099 (goto-char (point-min)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1100 (insert "Message-ID: " server-id "\n")) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1101 (widen)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1102 (run-hooks 'nntp-prepare-post-hook) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1103 (nntp-send-buffer "^[23].*\n"))))) |
17493 | 1104 |
1105 (deffoo nntp-request-type (group article) | |
1106 'news) | |
1107 | |
1108 (deffoo nntp-asynchronous-p () | |
1109 t) | |
1110 | |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1111 (deffoo nntp-request-set-mark (group actions &optional server) |
110109
8c2040cb14d7
gnus-html.el (gnus-html-wash-tags): Don't show images that are really small. They're probably tracking images; nntp.el (nntp-request-set-mark): Refuse to do marks if nntp-marks-file-name is nil.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110102
diff
changeset
|
1112 (when (and (not nntp-marks-is-evil) |
8c2040cb14d7
gnus-html.el (gnus-html-wash-tags): Don't show images that are really small. They're probably tracking images; nntp.el (nntp-request-set-mark): Refuse to do marks if nntp-marks-file-name is nil.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110102
diff
changeset
|
1113 nntp-marks-file-name) |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1114 (nntp-possibly-create-directory group server) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1115 (nntp-open-marks group server) |
111721
7bb815042e61
nnml.el, nnfolder.el, nntp.el (*-request-set-mark): Extend syntax with 'set.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111299
diff
changeset
|
1116 (setq nntp-marks (nnheader-update-marks-actions nntp-marks actions)) |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1117 (nntp-save-marks group server)) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1118 nil) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1119 |
110516
4d2f8b81bb01
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110422
diff
changeset
|
1120 (deffoo nntp-request-marks (group info &optional server) |
110109
8c2040cb14d7
gnus-html.el (gnus-html-wash-tags): Don't show images that are really small. They're probably tracking images; nntp.el (nntp-request-set-mark): Refuse to do marks if nntp-marks-file-name is nil.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110102
diff
changeset
|
1121 (when (and (not nntp-marks-is-evil) |
8c2040cb14d7
gnus-html.el (gnus-html-wash-tags): Don't show images that are really small. They're probably tracking images; nntp.el (nntp-request-set-mark): Refuse to do marks if nntp-marks-file-name is nil.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110102
diff
changeset
|
1122 nntp-marks-file-name) |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1123 (nntp-possibly-create-directory group server) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1124 (when (nntp-marks-changed-p group server) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1125 (nnheader-message 8 "Updating marks for %s..." group) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1126 (nntp-open-marks group server) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1127 ;; Update info using `nntp-marks'. |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1128 (mapc (lambda (pred) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1129 (unless (memq (cdr pred) gnus-article-unpropagated-mark-lists) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1130 (gnus-info-set-marks |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1131 info |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1132 (gnus-update-alist-soft |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1133 (cdr pred) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1134 (cdr (assq (cdr pred) nntp-marks)) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1135 (gnus-info-marks info)) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1136 t))) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1137 gnus-article-mark-lists) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1138 (let ((seen (cdr (assq 'read nntp-marks)))) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1139 (gnus-info-set-read info |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1140 (if (and (integerp (car seen)) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1141 (null (cdr seen))) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1142 (list (cons (car seen) (car seen))) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1143 seen))) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1144 (nnheader-message 8 "Updating marks for %s...done" group))) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1145 nil) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1146 |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1147 |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1148 |
17493 | 1149 ;;; Hooky functions. |
1150 | |
1151 (defun nntp-send-mode-reader () | |
1152 "Send the MODE READER command to the nntp server. | |
1153 This function is supposed to be called from `nntp-server-opened-hook'. | |
1154 It will make innd servers spawn an nnrpd process to allow actual article | |
1155 reading." | |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1156 (nntp-send-command "^.*\n" "MODE READER")) |
17493 | 1157 |
111299 | 1158 (declare-function netrc-parse "netrc" (&optional file)) |
107427
ecbe0edc4f69
Stop message.el from loading about 40 libraries it doesn't always need.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
1159 (declare-function netrc-machine "netrc" |
ecbe0edc4f69
Stop message.el from loading about 40 libraries it doesn't always need.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
1160 (list machine &optional port defaultport)) |
ecbe0edc4f69
Stop message.el from loading about 40 libraries it doesn't always need.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
1161 (declare-function netrc-get "netrc" (alist type)) |
ecbe0edc4f69
Stop message.el from loading about 40 libraries it doesn't always need.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
1162 |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1163 (defun nntp-send-authinfo (&optional send-if-force) |
17493 | 1164 "Send the AUTHINFO to the nntp server. |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1165 It will look in the \"~/.authinfo\" file for matching entries. If |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1166 nothing suitable is found there, it will prompt for a user name |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1167 and a password. |
17493 | 1168 |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1169 If SEND-IF-FORCE, only send authinfo to the server if the |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1170 .authinfo file has the FORCE token." |
107427
ecbe0edc4f69
Stop message.el from loading about 40 libraries it doesn't always need.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
1171 (require 'netrc) |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1172 (let* ((list (netrc-parse nntp-authinfo-file)) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1173 (alist (netrc-machine list nntp-address "nntp")) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1174 (force (or (netrc-get alist "force") nntp-authinfo-force)) |
107427
ecbe0edc4f69
Stop message.el from loading about 40 libraries it doesn't always need.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
1175 (auth-info |
101804 | 1176 (auth-source-user-or-password '("login" "password") nntp-address "nntp")) |
1177 (auth-user (nth 0 auth-info)) | |
1178 (auth-passwd (nth 1 auth-info)) | |
95820
645fb33380d6
Remove unnecessary eval-and-compile of autoloads.
Glenn Morris <rgm@gnu.org>
parents:
94837
diff
changeset
|
1179 (user (or |
94837 | 1180 ;; this is preferred to netrc-* |
101804 | 1181 auth-user |
95820
645fb33380d6
Remove unnecessary eval-and-compile of autoloads.
Glenn Morris <rgm@gnu.org>
parents:
94837
diff
changeset
|
1182 (netrc-get alist "login") |
94837 | 1183 nntp-authinfo-user)) |
1184 (passwd (or | |
1185 ;; this is preferred to netrc-* | |
101804 | 1186 auth-passwd |
94837 | 1187 (netrc-get alist "password")))) |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1188 (when (or (not send-if-force) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1189 force) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1190 (unless user |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1191 (setq user (read-string (format "NNTP (%s) user name: " nntp-address)) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1192 nntp-authinfo-user user)) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1193 (unless (member user '(nil "")) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1194 (nntp-send-command "^3.*\r?\n" "AUTHINFO USER" user) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1195 (when t ;???Should check if AUTHINFO succeeded |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1196 (nntp-send-command |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1197 "^2.*\r?\n" "AUTHINFO PASS" |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1198 (or passwd |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1199 nntp-authinfo-password |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1200 (setq nntp-authinfo-password |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1201 (read-passwd (format "NNTP (%s@%s) password: " |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1202 user nntp-address)))))))))) |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1203 |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1204 (defun nntp-send-nosy-authinfo () |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1205 "Send the AUTHINFO to the nntp server." |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1206 (let ((user (read-string (format "NNTP (%s) user name: " nntp-address)))) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1207 (unless (member user '(nil "")) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1208 (nntp-send-command "^3.*\r?\n" "AUTHINFO USER" user) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1209 (when t ;???Should check if AUTHINFO succeeded |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1210 (nntp-send-command "^2.*\r?\n" "AUTHINFO PASS" |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1211 (read-passwd (format "NNTP (%s@%s) password: " |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1212 user nntp-address))))))) |
17493 | 1213 |
1214 (defun nntp-send-authinfo-from-file () | |
1215 "Send the AUTHINFO to the nntp server. | |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1216 |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1217 The authinfo login name is taken from the user's login name and the |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1218 password contained in '~/.nntp-authinfo'." |
17493 | 1219 (when (file-exists-p "~/.nntp-authinfo") |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1220 (with-temp-buffer |
17493 | 1221 (insert-file-contents "~/.nntp-authinfo") |
1222 (goto-char (point-min)) | |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1223 (nntp-send-command "^3.*\r?\n" "AUTHINFO USER" (user-login-name)) |
17493 | 1224 (nntp-send-command |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1225 "^2.*\r?\n" "AUTHINFO PASS" |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1226 (buffer-substring (point) (point-at-eol)))))) |
17493 | 1227 |
1228 ;;; Internal functions. | |
1229 | |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1230 (defun nntp-handle-authinfo (process) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1231 "Take care of an authinfo response from the server." |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1232 (let ((last nntp-last-command)) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1233 (funcall nntp-authinfo-function) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1234 ;; We have to re-send the function that was interrupted by |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1235 ;; the authinfo request. |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1236 (nntp-erase-buffer nntp-server-buffer) |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1237 (nntp-send-string process last))) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1238 |
17493 | 1239 (defun nntp-make-process-buffer (buffer) |
1240 "Create a new, fresh buffer usable for nntp process connections." | |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1241 (with-current-buffer |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1242 (generate-new-buffer |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1243 (format " *server %s %s %s*" |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1244 nntp-address nntp-port-number |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1245 (gnus-buffer-exists-p buffer))) |
86225 | 1246 (mm-disable-multibyte) |
17493 | 1247 (set (make-local-variable 'after-change-functions) nil) |
1248 (set (make-local-variable 'nntp-process-wait-for) nil) | |
1249 (set (make-local-variable 'nntp-process-callback) nil) | |
1250 (set (make-local-variable 'nntp-process-to-buffer) nil) | |
1251 (set (make-local-variable 'nntp-process-start-point) nil) | |
1252 (set (make-local-variable 'nntp-process-decode) nil) | |
1253 (current-buffer))) | |
1254 | |
1255 (defun nntp-open-connection (buffer) | |
1256 "Open a connection to PORT on ADDRESS delivering output to BUFFER." | |
1257 (run-hooks 'nntp-prepare-server-hook) | |
1258 (let* ((pbuffer (nntp-make-process-buffer buffer)) | |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1259 (timer |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1260 (and nntp-connection-timeout |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1261 (run-at-time |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1262 nntp-connection-timeout nil |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1263 `(lambda () |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1264 (nntp-kill-buffer ,pbuffer))))) |
17493 | 1265 (process |
111789
f97704487fb3
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111721
diff
changeset
|
1266 (condition-case err |
19992
36e81448237d
(nntp-coding-system-for-write): New variable.
Kenichi Handa <handa@m17n.org>
parents:
19969
diff
changeset
|
1267 (let ((coding-system-for-read nntp-coding-system-for-read) |
111789
f97704487fb3
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111721
diff
changeset
|
1268 (coding-system-for-write nntp-coding-system-for-write) |
f97704487fb3
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111721
diff
changeset
|
1269 (map '((nntp-open-network-stream network) |
f97704487fb3
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111721
diff
changeset
|
1270 (nntp-open-ssl-stream tls) |
f97704487fb3
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111721
diff
changeset
|
1271 (nntp-open-tls-stream tls)))) |
f97704487fb3
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111721
diff
changeset
|
1272 (if (assoc nntp-open-connection-function map) |
f97704487fb3
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111721
diff
changeset
|
1273 (car (open-protocol-stream |
f97704487fb3
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111721
diff
changeset
|
1274 "nntpd" pbuffer nntp-address nntp-port-number |
f97704487fb3
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111721
diff
changeset
|
1275 :type (cadr |
f97704487fb3
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111721
diff
changeset
|
1276 (assoc nntp-open-connection-function map)) |
f97704487fb3
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111721
diff
changeset
|
1277 :end-of-command "^\\([2345]\\|[.]\\).*\n" |
f97704487fb3
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111721
diff
changeset
|
1278 :capability-command "CAPABILITIES\r\n" |
f97704487fb3
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111721
diff
changeset
|
1279 :success "^3" |
f97704487fb3
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111721
diff
changeset
|
1280 :starttls-function |
f97704487fb3
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111721
diff
changeset
|
1281 (lambda (capabilities) |
f97704487fb3
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111721
diff
changeset
|
1282 (if (not (string-match "STARTTLS" capabilities)) |
f97704487fb3
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111721
diff
changeset
|
1283 nil |
f97704487fb3
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111721
diff
changeset
|
1284 "STARTTLS\r\n")))) |
f97704487fb3
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111721
diff
changeset
|
1285 (funcall nntp-open-connection-function pbuffer))) |
f97704487fb3
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111721
diff
changeset
|
1286 (error |
f97704487fb3
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111721
diff
changeset
|
1287 (nnheader-report 'nntp "%s" err)) |
33575
93288a69f66f
2000-11-17 Katsumi Yamaoka <yamaoka@jpl.org>
Dave Love <fx@gnu.org>
parents:
31716
diff
changeset
|
1288 (quit |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1289 (message "Quit opening connection to %s" nntp-address) |
33575
93288a69f66f
2000-11-17 Katsumi Yamaoka <yamaoka@jpl.org>
Dave Love <fx@gnu.org>
parents:
31716
diff
changeset
|
1290 (nntp-kill-buffer pbuffer) |
93288a69f66f
2000-11-17 Katsumi Yamaoka <yamaoka@jpl.org>
Dave Love <fx@gnu.org>
parents:
31716
diff
changeset
|
1291 (signal 'quit nil) |
93288a69f66f
2000-11-17 Katsumi Yamaoka <yamaoka@jpl.org>
Dave Love <fx@gnu.org>
parents:
31716
diff
changeset
|
1292 nil)))) |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1293 (when timer |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1294 (nnheader-cancel-timer timer)) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1295 (unless process |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1296 (nntp-kill-buffer pbuffer)) |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1297 (when (and (buffer-name pbuffer) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1298 process) |
62943
11d53dd5abd9
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-345
Miles Bader <miles@gnu.org>
parents:
62907
diff
changeset
|
1299 (gnus-set-process-query-on-exit-flag process nil) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1300 (if (and (nntp-wait-for process "^2.*\n" buffer nil t) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1301 (memq (process-status process) '(open run))) |
17493 | 1302 (prog1 |
1303 (caar (push (list process buffer nil) nntp-connection-alist)) | |
1304 (push process nntp-connection-list) | |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1305 (with-current-buffer pbuffer |
17493 | 1306 (nntp-read-server-type) |
1307 (erase-buffer) | |
1308 (set-buffer nntp-server-buffer) | |
1309 (let ((nnheader-callback-function nil)) | |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1310 (run-hooks 'nntp-server-opened-hook) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1311 (nntp-send-authinfo t)))) |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1312 (nntp-kill-buffer (process-buffer process)) |
17493 | 1313 nil)))) |
1314 | |
1315 (defun nntp-read-server-type () | |
1316 "Find out what the name of the server we have connected to is." | |
1317 ;; Wait for the status string to arrive. | |
1318 (setq nntp-server-type (buffer-string)) | |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1319 (let ((case-fold-search t)) |
17493 | 1320 ;; Run server-specific commands. |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1321 (dolist (entry nntp-server-action-alist) |
17493 | 1322 (when (string-match (car entry) nntp-server-type) |
1323 (if (and (listp (cadr entry)) | |
1324 (not (eq 'lambda (caadr entry)))) | |
1325 (eval (cadr entry)) | |
1326 (funcall (cadr entry))))))) | |
1327 | |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1328 (defun nntp-async-wait (process wait-for buffer decode callback) |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1329 (with-current-buffer (process-buffer process) |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1330 (unless nntp-inside-change-function |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1331 (erase-buffer)) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1332 (setq nntp-process-wait-for wait-for |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1333 nntp-process-to-buffer buffer |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1334 nntp-process-decode decode |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1335 nntp-process-callback callback |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1336 nntp-process-start-point (point-max)) |
110023
fa10effce8f8
Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
107427
diff
changeset
|
1337 (setq after-change-functions '(nntp-after-change-function)))) |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1338 |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1339 (defun nntp-async-timer-handler () |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1340 (mapcar |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1341 (lambda (proc) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1342 (if (memq (process-status proc) '(open run)) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1343 (nntp-async-trigger proc) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1344 (nntp-async-stop proc))) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1345 nntp-async-process-list)) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1346 |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1347 (defun nntp-async-stop (proc) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1348 (setq nntp-async-process-list (delq proc nntp-async-process-list)) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1349 (when (and nntp-async-timer (not nntp-async-process-list)) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1350 (nnheader-cancel-timer nntp-async-timer) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1351 (setq nntp-async-timer nil))) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1352 |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1353 (defun nntp-after-change-function (beg end len) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1354 (unwind-protect |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1355 ;; we only care about insertions at eob |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1356 (when (and (eq 0 len) (eq (point-max) end)) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1357 (save-match-data |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1358 (let ((proc (get-buffer-process (current-buffer)))) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1359 (when proc |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1360 (nntp-async-trigger proc))))) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1361 ;; any throw from after-change-functions will leave it |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1362 ;; set to nil. so we reset it here, if necessary. |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1363 (when quit-flag |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1364 (setq after-change-functions '(nntp-after-change-function))))) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1365 |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1366 (defun nntp-async-trigger (process) |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1367 (with-current-buffer (process-buffer process) |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1368 (when nntp-process-callback |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1369 ;; do we have an error message? |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1370 (goto-char nntp-process-start-point) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1371 (if (memq (following-char) '(?4 ?5)) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1372 ;; wants credentials? |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1373 (if (looking-at "480") |
33575
93288a69f66f
2000-11-17 Katsumi Yamaoka <yamaoka@jpl.org>
Dave Love <fx@gnu.org>
parents:
31716
diff
changeset
|
1374 (nntp-handle-authinfo process) |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1375 ;; report error message. |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1376 (nntp-snarf-error-message) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1377 (nntp-do-callback nil)) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1378 |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1379 ;; got what we expect? |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1380 (goto-char (point-max)) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1381 (when (re-search-backward |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1382 nntp-process-wait-for nntp-process-start-point t) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1383 (let ((response (match-string 0))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1384 (with-current-buffer nntp-server-buffer |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1385 (setq nntp-process-response response))) |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1386 (nntp-async-stop process) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1387 ;; convert it. |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1388 (when (gnus-buffer-exists-p nntp-process-to-buffer) |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1389 (let ((buf (current-buffer)) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1390 (start nntp-process-start-point) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1391 (decode nntp-process-decode)) |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1392 (with-current-buffer nntp-process-to-buffer |
17493 | 1393 (goto-char (point-max)) |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1394 (save-restriction |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1395 (narrow-to-region (point) (point)) |
86225 | 1396 (nntp-insert-buffer-substring buf start) |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1397 (when decode |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1398 (nntp-decode-text)))))) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1399 ;; report it. |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1400 (goto-char (point-max)) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1401 (nntp-do-callback |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1402 (buffer-name (get-buffer nntp-process-to-buffer)))))))) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1403 |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1404 (defun nntp-do-callback (arg) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1405 (let ((callback nntp-process-callback) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1406 (nntp-inside-change-function t)) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1407 (setq nntp-process-callback nil) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1408 (funcall callback arg))) |
17493 | 1409 |
1410 (defun nntp-snarf-error-message () | |
1411 "Save the error message in the current buffer." | |
1412 (let ((message (buffer-string))) | |
1413 (while (string-match "[\r\n]+" message) | |
1414 (setq message (replace-match " " t t message))) | |
111830
79219ca01c7b
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111789
diff
changeset
|
1415 (nnheader-report 'nntp "%s" message) |
17493 | 1416 message)) |
1417 | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1418 (defun nntp-accept-process-output (process) |
17493 | 1419 "Wait for output from PROCESS and message some dots." |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1420 (with-current-buffer (or (nntp-find-connection-buffer nntp-server-buffer) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1421 nntp-server-buffer) |
49725
f13275d94b11
(nntp-accept-process-output): Don't use point-max to get the buffer's size.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49598
diff
changeset
|
1422 (let ((len (/ (buffer-size) 1024)) |
17493 | 1423 message-log-max) |
1424 (unless (< len 10) | |
1425 (setq nntp-have-messaged t) | |
1426 (nnheader-message 7 "nntp read: %dk" len))) | |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1427 (prog1 |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1428 (nnheader-accept-process-output process) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1429 ;; accept-process-output may update status of process to indicate |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1430 ;; that the server has closed the connection. This MUST be |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1431 ;; handled here as the buffer restored by the save-excursion may |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1432 ;; be the process's former output buffer (i.e. now killed) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1433 (or (and process |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1434 (memq (process-status process) '(open run))) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1435 (nntp-report "Server closed connection"))))) |
17493 | 1436 |
1437 (defun nntp-accept-response () | |
1438 "Wait for output from the process that outputs to BUFFER." | |
1439 (nntp-accept-process-output (nntp-find-connection nntp-server-buffer))) | |
1440 | |
1441 (defun nntp-possibly-change-group (group server &optional connectionless) | |
1442 (let ((nnheader-callback-function nil)) | |
1443 (when server | |
1444 (or (nntp-server-opened server) | |
1445 (nntp-open-server server nil connectionless))) | |
1446 | |
1447 (unless connectionless | |
1448 (or (nntp-find-connection nntp-server-buffer) | |
1449 (nntp-open-connection nntp-server-buffer)))) | |
1450 | |
1451 (when group | |
1452 (let ((entry (nntp-find-connection-entry nntp-server-buffer))) | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1453 (cond ((not entry) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1454 (nntp-report "Server closed connection")) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1455 ((not (equal group (caddr entry))) |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1456 (with-current-buffer (process-buffer (car entry)) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1457 (erase-buffer) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1458 (nntp-send-command "^[245].*\n" "GROUP" group) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1459 (setcar (cddr entry) group) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1460 (erase-buffer) |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1461 (nntp-erase-buffer nntp-server-buffer))))))) |
17493 | 1462 |
1463 (defun nntp-decode-text (&optional cr-only) | |
1464 "Decode the text in the current buffer." | |
1465 (goto-char (point-min)) | |
1466 (while (search-forward "\r" nil t) | |
1467 (delete-char -1)) | |
1468 (unless cr-only | |
1469 ;; Remove trailing ".\n" end-of-transfer marker. | |
1470 (goto-char (point-max)) | |
1471 (forward-line -1) | |
1472 (when (looking-at ".\n") | |
1473 (delete-char 2)) | |
1474 ;; Delete status line. | |
1475 (goto-char (point-min)) | |
33575
93288a69f66f
2000-11-17 Katsumi Yamaoka <yamaoka@jpl.org>
Dave Love <fx@gnu.org>
parents:
31716
diff
changeset
|
1476 (while (looking-at "[1-5][0-9][0-9] .*\n") |
93288a69f66f
2000-11-17 Katsumi Yamaoka <yamaoka@jpl.org>
Dave Love <fx@gnu.org>
parents:
31716
diff
changeset
|
1477 ;; For some unknown reason, there is more than one status line. |
93288a69f66f
2000-11-17 Katsumi Yamaoka <yamaoka@jpl.org>
Dave Love <fx@gnu.org>
parents:
31716
diff
changeset
|
1478 (delete-region (point) (progn (forward-line 1) (point)))) |
17493 | 1479 ;; Remove "." -> ".." encoding. |
1480 (while (search-forward "\n.." nil t) | |
1481 (delete-char -1)))) | |
1482 | |
1483 (defun nntp-encode-text () | |
1484 "Encode the text in the current buffer." | |
1485 (save-excursion | |
1486 ;; Replace "." at beginning of line with "..". | |
1487 (goto-char (point-min)) | |
1488 (while (re-search-forward "^\\." nil t) | |
1489 (insert ".")) | |
1490 (goto-char (point-max)) | |
1491 ;; Insert newline at the end of the buffer. | |
1492 (unless (bolp) | |
1493 (insert "\n")) | |
1494 ;; Insert `.' at end of buffer (end of text mark). | |
1495 (goto-char (point-max)) | |
23010
196f32d1873f
(nntp-encode-text): Properly encode outgoing text by
Richard M. Stallman <rms@gnu.org>
parents:
20236
diff
changeset
|
1496 (insert ".\n") |
196f32d1873f
(nntp-encode-text): Properly encode outgoing text by
Richard M. Stallman <rms@gnu.org>
parents:
20236
diff
changeset
|
1497 (goto-char (point-min)) |
196f32d1873f
(nntp-encode-text): Properly encode outgoing text by
Richard M. Stallman <rms@gnu.org>
parents:
20236
diff
changeset
|
1498 (while (not (eobp)) |
196f32d1873f
(nntp-encode-text): Properly encode outgoing text by
Richard M. Stallman <rms@gnu.org>
parents:
20236
diff
changeset
|
1499 (end-of-line) |
196f32d1873f
(nntp-encode-text): Properly encode outgoing text by
Richard M. Stallman <rms@gnu.org>
parents:
20236
diff
changeset
|
1500 (delete-char 1) |
196f32d1873f
(nntp-encode-text): Properly encode outgoing text by
Richard M. Stallman <rms@gnu.org>
parents:
20236
diff
changeset
|
1501 (insert nntp-end-of-line)))) |
17493 | 1502 |
1503 (defun nntp-retrieve-headers-with-xover (articles &optional fetch-old) | |
1504 (set-buffer nntp-server-buffer) | |
1505 (erase-buffer) | |
1506 (cond | |
1507 | |
1508 ;; This server does not talk NOV. | |
1509 ((not nntp-server-xover) | |
1510 nil) | |
1511 | |
1512 ;; We don't care about gaps. | |
1513 ((or (not nntp-nov-gap) | |
1514 fetch-old) | |
1515 (nntp-send-xover-command | |
1516 (if fetch-old | |
1517 (if (numberp fetch-old) | |
1518 (max 1 (- (car articles) fetch-old)) | |
1519 1) | |
1520 (car articles)) | |
1521 (car (last articles)) 'wait) | |
1522 | |
1523 (goto-char (point-min)) | |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1524 (when (looking-at "[1-5][0-9][0-9] .*\n") |
17493 | 1525 (delete-region (point) (progn (forward-line 1) (point)))) |
1526 (while (search-forward "\r" nil t) | |
1527 (replace-match "" t t)) | |
1528 (goto-char (point-max)) | |
1529 (forward-line -1) | |
1530 (when (looking-at "\\.") | |
1531 (delete-region (point) (progn (forward-line 1) (point))))) | |
1532 | |
1533 ;; We do it the hard way. For each gap, an XOVER command is sent | |
1534 ;; to the server. We do not wait for a reply from the server, we | |
1535 ;; just send them off as fast as we can. That means that we have | |
1536 ;; to count the number of responses we get back to find out when we | |
1537 ;; have gotten all we asked for. | |
1538 ((numberp nntp-nov-gap) | |
1539 (let ((count 0) | |
1540 (received 0) | |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1541 last-point |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1542 in-process-buffer-p |
17493 | 1543 (buf nntp-server-buffer) |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1544 (process-buffer (nntp-find-connection-buffer nntp-server-buffer)) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1545 first last status) |
17493 | 1546 ;; We have to check `nntp-server-xover'. If it gets set to nil, |
1547 ;; that means that the server does not understand XOVER, but we | |
1548 ;; won't know that until we try. | |
1549 (while (and nntp-server-xover articles) | |
1550 (setq first (car articles)) | |
1551 ;; Search forward until we find a gap, or until we run out of | |
1552 ;; articles. | |
1553 (while (and (cdr articles) | |
1554 (< (- (nth 1 articles) (car articles)) nntp-nov-gap)) | |
1555 (setq articles (cdr articles))) | |
1556 | |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1557 (setq in-process-buffer-p (stringp nntp-server-xover)) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1558 (nntp-send-xover-command first (setq last (car articles))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1559 (setq articles (cdr articles)) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42628
diff
changeset
|
1560 |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1561 (when (and nntp-server-xover in-process-buffer-p) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1562 ;; Don't count tried request. |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1563 (setq count (1+ count)) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42628
diff
changeset
|
1564 |
17493 | 1565 ;; Every 400 requests we have to read the stream in |
1566 ;; order to avoid deadlocks. | |
1567 (when (or (null articles) ;All requests have been sent. | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1568 (= 1 (% count nntp-maximum-request))) |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1569 |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1570 (nntp-accept-response) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1571 ;; On some Emacs versions the preceding function has a |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1572 ;; tendency to change the buffer. Perhaps. It's quite |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1573 ;; difficult to reproduce, because it only seems to happen |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1574 ;; once in a blue moon. |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1575 (set-buffer process-buffer) |
17493 | 1576 (while (progn |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1577 (goto-char (or last-point (point-min))) |
17493 | 1578 ;; Count replies. |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1579 (while (re-search-forward "^\\([0-9][0-9][0-9]\\) .*\n" |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1580 nil t) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1581 (incf received) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1582 (setq status (match-string 1)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1583 (if (string-match "^[45]" status) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1584 (setq status 'error) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1585 (setq status 'ok))) |
17493 | 1586 (setq last-point (point)) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1587 (or (< received count) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1588 (if (eq status 'error) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1589 nil |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1590 ;; I haven't started reading the final response |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1591 (progn |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1592 (goto-char (point-max)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1593 (forward-line -1) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1594 (not (looking-at "^\\.\r?\n")))))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1595 ;; I haven't read the end of the final response |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1596 (nntp-accept-response) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1597 (set-buffer process-buffer)))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1598 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1599 ;; Some nntp servers seem to have an extension to the XOVER |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1600 ;; extension. On these servers, requesting an article range |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1601 ;; preceeding the active range does not return an error as |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1602 ;; specified in the RFC. What we instead get is the NOV entry |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1603 ;; for the first available article. Obviously, a client can |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1604 ;; use that entry to avoid making unnecessary requests. The |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1605 ;; only problem is for a client that assumes that the response |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1606 ;; will always be within the requested ranage. For such a |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1607 ;; client, we can get N copies of the same entry (one for each |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1608 ;; XOVER command sent to the server). |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1609 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1610 (when (<= count 1) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1611 (goto-char (point-min)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1612 (when (re-search-forward "^[0-9][0-9][0-9] .*\n\\([0-9]+\\)" nil t) |
62907
88db2adda4b7
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-339
Miles Bader <miles@gnu.org>
parents:
62428
diff
changeset
|
1613 (let ((low-limit (string-to-number |
64754
fafd692d1e40
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64092
diff
changeset
|
1614 (buffer-substring (match-beginning 1) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1615 (match-end 1))))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1616 (while (and articles (<= (car articles) low-limit)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1617 (setq articles (cdr articles)))))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1618 (set-buffer buf)) |
17493 | 1619 |
1620 (when nntp-server-xover | |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1621 (when in-process-buffer-p |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1622 (set-buffer buf) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1623 (goto-char (point-max)) |
86225 | 1624 (nntp-insert-buffer-substring process-buffer) |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1625 (set-buffer process-buffer) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1626 (erase-buffer) |
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1627 (set-buffer buf)) |
17493 | 1628 |
1629 ;; We remove any "." lines and status lines. | |
1630 (goto-char (point-min)) | |
1631 (while (search-forward "\r" nil t) | |
1632 (delete-char -1)) | |
1633 (goto-char (point-min)) | |
1634 (delete-matching-lines "^\\.$\\|^[1-5][0-9][0-9] ") | |
1635 t)))) | |
1636 | |
1637 nntp-server-xover) | |
1638 | |
1639 (defun nntp-send-xover-command (beg end &optional wait-for-reply) | |
1640 "Send the XOVER command to the server." | |
1641 (let ((range (format "%d-%d" beg end)) | |
1642 (nntp-inhibit-erase t)) | |
1643 (if (stringp nntp-server-xover) | |
1644 ;; If `nntp-server-xover' is a string, then we just send this | |
1645 ;; command. | |
1646 (if wait-for-reply | |
1647 (nntp-send-command-nodelete | |
1648 "\r?\n\\.\r?\n" nntp-server-xover range) | |
1649 ;; We do not wait for the reply. | |
31716
9968f55ad26e
Update to emacs-21-branch of the Gnus CVS repository.
Gerd Moellmann <gerd@gnu.org>
parents:
24357
diff
changeset
|
1650 (nntp-send-command-nodelete nil nntp-server-xover range)) |
17493 | 1651 (let ((commands nntp-xover-commands)) |
1652 ;; `nntp-xover-commands' is a list of possible XOVER commands. | |
1653 ;; We try them all until we get at positive response. | |
1654 (while (and commands (eq nntp-server-xover 'try)) | |
1655 (nntp-send-command-nodelete "\r?\n\\.\r?\n" (car commands) range) | |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1656 (with-current-buffer nntp-server-buffer |
17493 | 1657 (goto-char (point-min)) |
1658 (and (looking-at "[23]") ; No error message. | |
1659 ;; We also have to look at the lines. Some buggy | |
1660 ;; servers give back simple lines with just the | |
1661 ;; article number. How... helpful. | |
1662 (progn | |
1663 (forward-line 1) | |
78013 | 1664 ;; More text after number, or a dot. |
1665 (looking-at "[0-9]+\t...\\|\\.\r?\n")) | |
17493 | 1666 (setq nntp-server-xover (car commands)))) |
1667 (setq commands (cdr commands))) | |
1668 ;; If none of the commands worked, we disable XOVER. | |
1669 (when (eq nntp-server-xover 'try) | |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1670 (nntp-erase-buffer nntp-server-buffer) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1671 (setq nntp-server-xover nil)) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1672 nntp-server-xover)))) |
17493 | 1673 |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1674 (defun nntp-find-group-and-number (&optional group) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1675 (save-excursion |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1676 (save-restriction |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1677 ;; FIXME: This is REALLY FISHY: set-buffer after save-restriction?!? |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1678 (set-buffer nntp-server-buffer) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1679 (narrow-to-region (goto-char (point-min)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1680 (or (search-forward "\n\n" nil t) (point-max))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1681 (goto-char (point-min)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1682 ;; We first find the number by looking at the status line. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1683 (let ((number (and (looking-at "2[0-9][0-9] +\\([0-9]+\\) ") |
62907
88db2adda4b7
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-339
Miles Bader <miles@gnu.org>
parents:
62428
diff
changeset
|
1684 (string-to-number |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1685 (buffer-substring (match-beginning 1) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1686 (match-end 1))))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1687 newsgroups xref) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1688 (and number (zerop number) (setq number nil)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1689 (if number |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1690 ;; Then we find the group name. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1691 (setq group |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1692 (cond |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1693 ;; If there is only one group in the Newsgroups |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1694 ;; header, then it seems quite likely that this |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1695 ;; article comes from that group, I'd say. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1696 ((and (setq newsgroups |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1697 (mail-fetch-field "newsgroups")) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1698 (not (string-match "," newsgroups))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1699 newsgroups) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1700 ;; If there is more than one group in the |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1701 ;; Newsgroups header, then the Xref header should |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1702 ;; be filled out. We hazard a guess that the group |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1703 ;; that has this article number in the Xref header |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1704 ;; is the one we are looking for. This might very |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1705 ;; well be wrong if this article happens to have |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1706 ;; the same number in several groups, but that's |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1707 ;; life. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1708 ((and (setq xref (mail-fetch-field "xref")) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1709 number |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1710 (string-match |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1711 (format "\\([^ :]+\\):%d" number) xref)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1712 (match-string 1 xref)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1713 (t ""))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1714 (cond |
78546 | 1715 ((and (not nntp-xref-number-is-evil) |
1716 (setq xref (mail-fetch-field "xref")) | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1717 (string-match |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1718 (if group |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1719 (concat "\\(" (regexp-quote group) "\\):\\([0-9]+\\)") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1720 "\\([^ :]+\\):\\([0-9]+\\)") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1721 xref)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1722 (setq group (match-string 1 xref) |
62907
88db2adda4b7
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-339
Miles Bader <miles@gnu.org>
parents:
62428
diff
changeset
|
1723 number (string-to-number (match-string 2 xref)))) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1724 ((and (setq newsgroups |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1725 (mail-fetch-field "newsgroups")) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1726 (not (string-match "," newsgroups))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1727 (setq group newsgroups)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1728 (group) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1729 (t (setq group "")))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1730 (when (string-match "\r" group) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1731 (setq group (substring group 0 (match-beginning 0)))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1732 (cons group number))))) |
17493 | 1733 |
1734 (defun nntp-wait-for-string (regexp) | |
1735 "Wait until string arrives in the buffer." | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1736 (let ((buf (current-buffer)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1737 proc) |
17493 | 1738 (goto-char (point-min)) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1739 (while (and (setq proc (get-buffer-process buf)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1740 (memq (process-status proc) '(open run)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1741 (not (re-search-forward regexp nil t))) |
110257
650122532cd3
nntp.el (nntp-wait-for-string): Supply a timeout for accept-process-output to ensure progress.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110111
diff
changeset
|
1742 (accept-process-output proc 0.1) |
17493 | 1743 (set-buffer buf) |
1744 (goto-char (point-min))))) | |
1745 | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1746 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1747 ;; ========================================================================== |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1748 ;; Obsolete nntp-open-* connection methods -- drv |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1749 ;; ========================================================================== |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1750 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1751 (defvoo nntp-open-telnet-envuser nil |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1752 "*If non-nil, telnet session (client and server both) will support the ENVIRON option and not prompt for login name.") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1753 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1754 (defvoo nntp-telnet-shell-prompt "bash\\|\$ *\r?$\\|> *\r?" |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1755 "*Regular expression to match the shell prompt on the remote machine.") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1756 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1757 (defvoo nntp-rlogin-program "rsh" |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1758 "*Program used to log in on remote machines. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1759 The default is \"rsh\", but \"ssh\" is a popular alternative.") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1760 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1761 (defvoo nntp-rlogin-parameters '("telnet" "-8" "${NNTPSERVER:=news}" "nntp") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1762 "*Parameters to `nntp-open-rlogin'. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1763 That function may be used as `nntp-open-connection-function'. In that |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1764 case, this list will be used as the parameter list given to rsh.") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1765 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1766 (defvoo nntp-rlogin-user-name nil |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1767 "*User name on remote system when using the rlogin connect method.") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1768 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1769 (defvoo nntp-telnet-parameters |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1770 '("exec" "telnet" "-8" "${NNTPSERVER:=news}" "nntp") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1771 "*Parameters to `nntp-open-telnet'. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1772 That function may be used as `nntp-open-connection-function'. In that |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1773 case, this list will be executed as a command after logging in |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1774 via telnet.") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1775 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1776 (defvoo nntp-telnet-user-name nil |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1777 "User name to log in via telnet with.") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1778 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1779 (defvoo nntp-telnet-passwd nil |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1780 "Password to use to log in via telnet with.") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1781 |
93419
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1782 (defun nntp-service-to-port (svc) |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1783 (cond |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1784 ((integerp svc) (number-to-string svc)) |
106614
6609f07cf9fd
replace [:digit:] with [0-9] for XEmacs.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
101804
diff
changeset
|
1785 ((string-match "\\`[0-9]+\\'" svc) svc) |
93419
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1786 (t |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1787 (with-temp-buffer |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1788 (ignore-errors (insert-file-contents "/etc/services")) |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1789 (goto-char (point-min)) |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1790 (if (re-search-forward (concat "^" (regexp-quote svc) |
106614
6609f07cf9fd
replace [:digit:] with [0-9] for XEmacs.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
101804
diff
changeset
|
1791 "[ \t]+\\([0-9]+\\)/tcp")) |
93419
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1792 (match-string 1) |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1793 svc))))) |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1794 |
17493 | 1795 (defun nntp-open-telnet (buffer) |
93419
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1796 (with-current-buffer buffer |
17493 | 1797 (erase-buffer) |
19969
5f1ab3dd344d
*** empty log message ***
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
19598
diff
changeset
|
1798 (let ((proc (apply |
5f1ab3dd344d
*** empty log message ***
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
19598
diff
changeset
|
1799 'start-process |
5f1ab3dd344d
*** empty log message ***
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
19598
diff
changeset
|
1800 "nntpd" buffer nntp-telnet-command nntp-telnet-switches)) |
17493 | 1801 (case-fold-search t)) |
1802 (when (memq (process-status proc) '(open run)) | |
33575
93288a69f66f
2000-11-17 Katsumi Yamaoka <yamaoka@jpl.org>
Dave Love <fx@gnu.org>
parents:
31716
diff
changeset
|
1803 (nntp-wait-for-string "^r?telnet") |
17493 | 1804 (process-send-string proc "set escape \^X\n") |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1805 (cond |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1806 ((and nntp-open-telnet-envuser nntp-telnet-user-name) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1807 (process-send-string proc (concat "open " "-l" nntp-telnet-user-name |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1808 nntp-address "\n"))) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1809 (t |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1810 (process-send-string proc (concat "open " nntp-address "\n")))) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1811 (cond |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1812 ((not nntp-open-telnet-envuser) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1813 (nntp-wait-for-string "^\r*.?login:") |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1814 (process-send-string |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1815 proc (concat |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1816 (or nntp-telnet-user-name |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1817 (setq nntp-telnet-user-name (read-string "login: "))) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1818 "\n")))) |
17493 | 1819 (nntp-wait-for-string "^\r*.?password:") |
1820 (process-send-string | |
1821 proc (concat | |
1822 (or nntp-telnet-passwd | |
1823 (setq nntp-telnet-passwd | |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1824 (read-passwd "Password: "))) |
17493 | 1825 "\n")) |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1826 (nntp-wait-for-string nntp-telnet-shell-prompt) |
17493 | 1827 (process-send-string |
1828 proc (concat (mapconcat 'identity nntp-telnet-parameters " ") "\n")) | |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1829 (nntp-wait-for-string "^\r*20[01]") |
17493 | 1830 (beginning-of-line) |
1831 (delete-region (point-min) (point)) | |
1832 (process-send-string proc "\^]") | |
33575
93288a69f66f
2000-11-17 Katsumi Yamaoka <yamaoka@jpl.org>
Dave Love <fx@gnu.org>
parents:
31716
diff
changeset
|
1833 (nntp-wait-for-string "^r?telnet") |
17493 | 1834 (process-send-string proc "mode character\n") |
1835 (accept-process-output proc 1) | |
1836 (sit-for 1) | |
1837 (goto-char (point-min)) | |
1838 (forward-line 1) | |
1839 (delete-region (point) (point-max))) | |
1840 proc))) | |
1841 | |
1842 (defun nntp-open-rlogin (buffer) | |
1843 "Open a connection to SERVER using rsh." | |
1844 (let ((proc (if nntp-rlogin-user-name | |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1845 (apply 'start-process |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1846 "nntpd" buffer nntp-rlogin-program |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1847 nntp-address "-l" nntp-rlogin-user-name |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1848 nntp-rlogin-parameters) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1849 (apply 'start-process |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1850 "nntpd" buffer nntp-rlogin-program nntp-address |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1851 nntp-rlogin-parameters)))) |
93419
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1852 (with-current-buffer buffer |
24357
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1853 (nntp-wait-for-string "^\r*20[01]") |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1854 (beginning-of-line) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1855 (delete-region (point-min) (point)) |
15fc6acbae7a
Upgrading to Gnus 5.7; see ChangeLog
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
23870
diff
changeset
|
1856 proc))) |
17493 | 1857 |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1858 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1859 ;; ========================================================================== |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1860 ;; Replacements for the nntp-open-* functions -- drv |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1861 ;; ========================================================================== |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1862 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1863 (defun nntp-open-telnet-stream (buffer) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1864 "Open a nntp connection by telnet'ing the news server. |
93419
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1865 `nntp-open-netcat-stream' is recommended in place of this function |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1866 because it is more reliable. |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1867 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1868 Please refer to the following variables to customize the connection: |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1869 - `nntp-pre-command', |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1870 - `nntp-telnet-command', |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1871 - `nntp-telnet-switches', |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1872 - `nntp-address', |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1873 - `nntp-port-number', |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1874 - `nntp-end-of-line'." |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1875 (let ((command `(,nntp-telnet-command |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1876 ,@nntp-telnet-switches |
93386 | 1877 ,nntp-address |
93419
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1878 ,(nntp-service-to-port nntp-port-number))) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1879 proc) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1880 (and nntp-pre-command |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1881 (push nntp-pre-command command)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1882 (setq proc (apply 'start-process "nntpd" buffer command)) |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1883 (with-current-buffer buffer |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1884 (nntp-wait-for-string "^\r*20[01]") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1885 (beginning-of-line) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1886 (delete-region (point-min) (point)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1887 proc))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1888 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1889 (defun nntp-open-via-rlogin-and-telnet (buffer) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1890 "Open a connection to an nntp server through an intermediate host. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1891 First rlogin to the remote host, and then telnet the real news server |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1892 from there. |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1893 `nntp-open-via-rlogin-and-netcat' is recommended in place of this function |
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1894 because it is more reliable. |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1895 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1896 Please refer to the following variables to customize the connection: |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1897 - `nntp-pre-command', |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1898 - `nntp-via-rlogin-command', |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1899 - `nntp-via-rlogin-command-switches', |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1900 - `nntp-via-user-name', |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1901 - `nntp-via-address', |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1902 - `nntp-telnet-command', |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1903 - `nntp-telnet-switches', |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1904 - `nntp-address', |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1905 - `nntp-port-number', |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1906 - `nntp-end-of-line'." |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1907 (let ((command `(,nntp-via-address |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1908 ,nntp-telnet-command |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1909 ,@nntp-telnet-switches)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1910 proc) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1911 (when nntp-via-user-name |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1912 (setq command `("-l" ,nntp-via-user-name ,@command))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1913 (when nntp-via-rlogin-command-switches |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1914 (setq command (append nntp-via-rlogin-command-switches command))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1915 (push nntp-via-rlogin-command command) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1916 (and nntp-pre-command |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1917 (push nntp-pre-command command)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1918 (setq proc (apply 'start-process "nntpd" buffer command)) |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1919 (with-current-buffer buffer |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1920 (nntp-wait-for-string "^r?telnet") |
93386 | 1921 (process-send-string proc (concat "open " nntp-address " " |
93419
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1922 (nntp-service-to-port nntp-port-number) |
93386 | 1923 "\n")) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1924 (nntp-wait-for-string "^\r*20[01]") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1925 (beginning-of-line) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1926 (delete-region (point-min) (point)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1927 (process-send-string proc "\^]") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1928 (nntp-wait-for-string "^r?telnet") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1929 (process-send-string proc "mode character\n") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1930 (accept-process-output proc 1) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1931 (sit-for 1) |
17493 | 1932 (goto-char (point-min)) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1933 (forward-line 1) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1934 (delete-region (point) (point-max))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1935 proc)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1936 |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1937 (defun nntp-open-via-rlogin-and-netcat (buffer) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1938 "Open a connection to an nntp server through an intermediate host. |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1939 First rlogin to the remote host, and then connect to the real news |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1940 server from there using the netcat command. |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1941 |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1942 Please refer to the following variables to customize the connection: |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1943 - `nntp-pre-command', |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1944 - `nntp-via-rlogin-command', |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1945 - `nntp-via-rlogin-command-switches', |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1946 - `nntp-via-user-name', |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1947 - `nntp-via-address', |
93419
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1948 - `nntp-netcat-command', |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1949 - `nntp-netcat-switches', |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1950 - `nntp-address', |
93419
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1951 - `nntp-port-number'." |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1952 (let ((command `(,@(when nntp-pre-command |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1953 (list nntp-pre-command)) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1954 ,nntp-via-rlogin-command |
93419
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1955 ,@nntp-via-rlogin-command-switches |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1956 ,@(when nntp-via-user-name |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1957 (list "-l" nntp-via-user-name)) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1958 ,nntp-via-address |
93419
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1959 ,nntp-netcat-command |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1960 ,@nntp-netcat-switches |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1961 ,nntp-address |
93419
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1962 ,(nntp-service-to-port nntp-port-number)))) |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1963 ;; A non-nil connection type results in mightily odd behavior where |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1964 ;; (process-send-string proc "\^M") ends up sending a "\n" to the |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1965 ;; ssh process. --Stef |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1966 ;; Also a nil connection allow ssh-askpass to work under X11. |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1967 (let ((process-connection-type nil)) |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1968 (apply 'start-process "nntpd" buffer command)))) |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1969 |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1970 (defun nntp-open-netcat-stream (buffer) |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1971 "Open a connection to an nntp server through netcat. |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1972 I.e. use the `nc' command rather than Emacs's builtin networking code. |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1973 |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1974 Please refer to the following variables to customize the connection: |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1975 - `nntp-pre-command', |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1976 - `nntp-netcat-command', |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1977 - `nntp-netcat-switches', |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1978 - `nntp-address', |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1979 - `nntp-port-number'." |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1980 (let ((command `(,nntp-netcat-command |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1981 ,@nntp-netcat-switches |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1982 ,nntp-address |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1983 ,(nntp-service-to-port nntp-port-number)))) |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1984 (and nntp-pre-command (push nntp-pre-command command)) |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1985 (let ((process-connection-type nil)) ;See `nntp-open-via-rlogin-and-netcat'. |
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
1986 (apply 'start-process "nntpd" buffer command)))) |
110111
5b9f64b04a04
Delete all trailing white space.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110109
diff
changeset
|
1987 |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
1988 |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1989 (defun nntp-open-via-telnet-and-telnet (buffer) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1990 "Open a connection to an nntp server through an intermediate host. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1991 First telnet the remote host, and then telnet the real news server |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1992 from there. |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1993 |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1994 Please refer to the following variables to customize the connection: |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1995 - `nntp-pre-command', |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1996 - `nntp-via-telnet-command', |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1997 - `nntp-via-telnet-switches', |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1998 - `nntp-via-address', |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
1999 - `nntp-via-envuser', |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2000 - `nntp-via-user-name', |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2001 - `nntp-via-user-password', |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2002 - `nntp-via-shell-prompt', |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2003 - `nntp-telnet-command', |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2004 - `nntp-telnet-switches', |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2005 - `nntp-address', |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2006 - `nntp-port-number', |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2007 - `nntp-end-of-line'." |
92778
054fe9aaf3e3
Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2008 (with-current-buffer buffer |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2009 (erase-buffer) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2010 (let ((command `(,nntp-via-telnet-command ,@nntp-via-telnet-switches)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2011 (case-fold-search t) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2012 proc) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2013 (and nntp-pre-command (push nntp-pre-command command)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2014 (setq proc (apply 'start-process "nntpd" buffer command)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2015 (when (memq (process-status proc) '(open run)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2016 (nntp-wait-for-string "^r?telnet") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2017 (process-send-string proc "set escape \^X\n") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2018 (cond |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2019 ((and nntp-via-envuser nntp-via-user-name) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2020 (process-send-string proc (concat "open " "-l" nntp-via-user-name |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2021 nntp-via-address "\n"))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2022 (t |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2023 (process-send-string proc (concat "open " nntp-via-address |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2024 "\n")))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2025 (when (not nntp-via-envuser) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2026 (nntp-wait-for-string "^\r*.?login:") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2027 (process-send-string proc |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2028 (concat |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2029 (or nntp-via-user-name |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2030 (setq nntp-via-user-name |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2031 (read-string "login: "))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2032 "\n"))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2033 (nntp-wait-for-string "^\r*.?password:") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2034 (process-send-string proc |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2035 (concat |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2036 (or nntp-via-user-password |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2037 (setq nntp-via-user-password |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2038 (read-passwd "Password: "))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2039 "\n")) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2040 (nntp-wait-for-string nntp-via-shell-prompt) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2041 (let ((real-telnet-command `("exec" |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2042 ,nntp-telnet-command |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2043 ,@nntp-telnet-switches |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2044 ,nntp-address |
93419
4482f387c2fe
(nntp-netcat-command): Rename from nntp-via-netcat-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93386
diff
changeset
|
2045 ,(nntp-service-to-port nntp-port-number)))) |
56927
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2046 (process-send-string proc |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2047 (concat (mapconcat 'identity |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2048 real-telnet-command " ") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2049 "\n"))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2050 (nntp-wait-for-string "^\r*20[01]") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2051 (beginning-of-line) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2052 (delete-region (point-min) (point)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2053 (process-send-string proc "\^]") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2054 (nntp-wait-for-string "^r?telnet") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2055 (process-send-string proc "mode character\n") |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2056 (accept-process-output proc 1) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2057 (sit-for 1) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2058 (goto-char (point-min)) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2059 (forward-line 1) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2060 (delete-region (point) (point-max))) |
55fd4f77387a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-523
Miles Bader <miles@gnu.org>
parents:
56281
diff
changeset
|
2061 proc))) |
17493 | 2062 |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2063 ;; Marks handling |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2064 |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2065 (defun nntp-marks-directory (server) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2066 (expand-file-name server nntp-marks-directory)) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2067 |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2068 (defvar nntp-server-to-method-cache nil |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2069 "Alist of servers and select methods.") |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2070 |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2071 (defun nntp-group-pathname (server group &optional file) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2072 "Return an absolute file name of FILE for GROUP on SERVER." |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2073 (let ((method (cdr (assoc server nntp-server-to-method-cache)))) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2074 (unless method |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2075 (push (cons server (setq method (or (gnus-server-to-method server) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2076 (gnus-find-method-for-group group)))) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2077 nntp-server-to-method-cache)) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2078 (nnmail-group-pathname |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2079 (mm-decode-coding-string group |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2080 (inline (gnus-group-name-charset method group))) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2081 (nntp-marks-directory server) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2082 file))) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2083 |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2084 (defun nntp-possibly-create-directory (group server) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2085 (let ((dir (nntp-group-pathname server group)) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2086 (file-name-coding-system nnmail-pathname-coding-system)) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2087 (unless (file-exists-p dir) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2088 (make-directory (directory-file-name dir) t) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2089 (nnheader-message 5 "Creating nntp marks directory %s" dir)))) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2090 |
95820
645fb33380d6
Remove unnecessary eval-and-compile of autoloads.
Glenn Morris <rgm@gnu.org>
parents:
94837
diff
changeset
|
2091 (autoload 'time-less-p "time-date") |
85712
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2092 |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2093 (defun nntp-marks-changed-p (group server) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2094 (let ((file (nntp-group-pathname server group nntp-marks-file-name)) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2095 (file-name-coding-system nnmail-pathname-coding-system)) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2096 (if (null (gnus-gethash file nntp-marks-modtime)) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2097 t ;; never looked at marks file, assume it has changed |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2098 (time-less-p (gnus-gethash file nntp-marks-modtime) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2099 (nth 5 (file-attributes file)))))) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2100 |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2101 (defun nntp-save-marks (group server) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2102 (let ((file-name-coding-system nnmail-pathname-coding-system) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2103 (file (nntp-group-pathname server group nntp-marks-file-name))) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2104 (condition-case err |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2105 (progn |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2106 (nntp-possibly-create-directory group server) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2107 (with-temp-file file |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2108 (erase-buffer) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2109 (gnus-prin1 nntp-marks) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2110 (insert "\n")) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2111 (gnus-sethash file |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2112 (nth 5 (file-attributes file)) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2113 nntp-marks-modtime)) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2114 (error (or (gnus-yes-or-no-p |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2115 (format "Could not write to %s (%s). Continue? " file err)) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2116 (error "Cannot write to %s (%s)" file err)))))) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2117 |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2118 (defun nntp-open-marks (group server) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2119 (let ((file (nntp-group-pathname server group nntp-marks-file-name)) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2120 (file-name-coding-system nnmail-pathname-coding-system)) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2121 (if (file-exists-p file) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2122 (condition-case err |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2123 (with-temp-buffer |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2124 (gnus-sethash file (nth 5 (file-attributes file)) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2125 nntp-marks-modtime) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2126 (nnheader-insert-file-contents file) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2127 (setq nntp-marks (read (current-buffer))) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2128 (dolist (el gnus-article-unpropagated-mark-lists) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2129 (setq nntp-marks (gnus-remassoc el nntp-marks)))) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2130 (error (or (gnus-yes-or-no-p |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2131 (format "Error reading nntp marks file %s (%s). Continuing will use marks from .newsrc.eld. Continue? " file err)) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2132 (error "Cannot read nntp marks file %s (%s)" file err)))) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2133 ;; User didn't have a .marks file. Probably first time |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2134 ;; user of the .marks stuff. Bootstrap it from .newsrc.eld. |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2135 (let ((info (gnus-get-info |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2136 (gnus-group-prefixed-name |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2137 group |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2138 (gnus-server-to-method (format "nntp:%s" server))))) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2139 (decoded-name (mm-decode-coding-string |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2140 group |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2141 (gnus-group-name-charset |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2142 (gnus-server-to-method server) group)))) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2143 (nnheader-message 7 "Bootstrapping marks for %s..." decoded-name) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2144 (setq nntp-marks (gnus-info-marks info)) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2145 (push (cons 'read (gnus-info-read info)) nntp-marks) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2146 (dolist (el gnus-article-unpropagated-mark-lists) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2147 (setq nntp-marks (gnus-remassoc el nntp-marks))) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2148 (nntp-save-marks group server) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2149 (nnheader-message 7 "Bootstrapping marks for %s...done" |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2150 decoded-name))))) |
a3c27999decb
Update Gnus to No Gnus 0.7 from the Gnus CVS trunk
Miles Bader <miles@gnu.org>
parents:
78546
diff
changeset
|
2151 |
17493 | 2152 (provide 'nntp) |
2153 | |
2154 ;;; nntp.el ends here |