2000-09-19 13:37:09 +00:00
|
|
|
|
;;; nntp.el --- nntp access for Gnus
|
2003-02-28 13:36:11 +00:00
|
|
|
|
|
2005-08-06 19:51:42 +00:00
|
|
|
|
;; Copyright (C) 1987, 1988, 1989, 1990, 1992, 1993,
|
|
|
|
|
;; 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002,
|
2006-02-05 13:56:44 +00:00
|
|
|
|
;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
1999-02-20 14:05:57 +00:00
|
|
|
|
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
|
1997-04-16 22:13:18 +00:00
|
|
|
|
;; Keywords: news
|
|
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is free software; you can redistribute it and/or modify
|
2004-09-04 13:13:48 +00:00
|
|
|
|
;; it under the terms of the GNU General Public License as published
|
|
|
|
|
;; by the Free Software Foundation; either version 2, or (at your
|
|
|
|
|
;; option) any later version.
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful, but
|
|
|
|
|
;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
|
;; General Public License for more details.
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2004-09-04 13:13:48 +00:00
|
|
|
|
;; along with GNU Emacs; see the file COPYING. If not, write to the
|
2005-07-05 00:35:10 +00:00
|
|
|
|
;; Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
|
|
|
|
|
;; MA 02110-1301, USA.
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
|
|
(require 'nnheader)
|
|
|
|
|
(require 'nnoo)
|
|
|
|
|
(require 'gnus-util)
|
|
|
|
|
|
|
|
|
|
(nnoo-declare nntp)
|
|
|
|
|
|
2000-09-19 13:37:09 +00:00
|
|
|
|
(eval-when-compile (require 'cl))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
2004-09-08 18:17:56 +00:00
|
|
|
|
(defgroup nntp nil
|
|
|
|
|
"NNTP access for Gnus."
|
|
|
|
|
:group 'gnus)
|
|
|
|
|
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(defvoo nntp-address nil
|
|
|
|
|
"Address of the physical nntp server.")
|
|
|
|
|
|
|
|
|
|
(defvoo nntp-port-number "nntp"
|
|
|
|
|
"Port number on the physical nntp server.")
|
|
|
|
|
|
|
|
|
|
(defvoo nntp-server-opened-hook '(nntp-send-mode-reader)
|
|
|
|
|
"*Hook used for sending commands to the server at startup.
|
|
|
|
|
The default value is `nntp-send-mode-reader', which makes an innd
|
1999-02-20 14:05:57 +00:00
|
|
|
|
server spawn an nnrpd server.")
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(defvoo nntp-authinfo-function 'nntp-send-authinfo
|
1999-02-20 14:05:57 +00:00
|
|
|
|
"Function used to send AUTHINFO to the server.
|
|
|
|
|
It is called with no parameters.")
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(defvoo nntp-server-action-alist
|
2000-09-19 13:37:09 +00:00
|
|
|
|
'(("nntpd 1\\.5\\.11t"
|
|
|
|
|
(remove-hook 'nntp-server-opened-hook 'nntp-send-mode-reader))
|
|
|
|
|
("NNRP server Netscape"
|
|
|
|
|
(setq nntp-server-list-active-group nil)))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
"Alist of regexps to match on server types and actions to be taken.
|
|
|
|
|
For instance, if you want Gnus to beep every time you connect
|
|
|
|
|
to innd, you could say something like:
|
|
|
|
|
|
|
|
|
|
\(setq nntp-server-action-alist
|
|
|
|
|
'((\"innd\" (ding))))
|
|
|
|
|
|
|
|
|
|
You probably don't want to do that, though.")
|
|
|
|
|
|
|
|
|
|
(defvoo nntp-open-connection-function 'nntp-open-network-stream
|
|
|
|
|
"*Function used for connecting to a remote system.
|
2004-09-04 13:13:48 +00:00
|
|
|
|
It will be called with the buffer to output in as argument.
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
Currently, five such functions are provided (please refer to their
|
|
|
|
|
respective doc string for more information), three of them establishing
|
|
|
|
|
direct connections to the nntp server, and two of them using an indirect
|
|
|
|
|
host.
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
Direct connections:
|
|
|
|
|
- `nntp-open-network-stream' (the default),
|
|
|
|
|
- `nntp-open-ssl-stream',
|
|
|
|
|
- `nntp-open-tls-stream',
|
|
|
|
|
- `nntp-open-telnet-stream'.
|
1999-02-20 14:05:57 +00:00
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
Indirect connections:
|
|
|
|
|
- `nntp-open-via-rlogin-and-telnet',
|
|
|
|
|
- `nntp-open-via-telnet-and-telnet'.")
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(defvoo nntp-pre-command nil
|
|
|
|
|
"*Pre-command to use with the various nntp-open-via-* methods.
|
|
|
|
|
This is where you would put \"runsocks\" or stuff like that.")
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(defvoo nntp-telnet-command "telnet"
|
|
|
|
|
"*Telnet command used to connect to the nntp server.
|
|
|
|
|
This command is used by the various nntp-open-via-* methods.")
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(defvoo nntp-telnet-switches '("-8")
|
|
|
|
|
"*Switches given to the telnet command `nntp-telnet-command'.")
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(defvoo nntp-end-of-line "\r\n"
|
|
|
|
|
"*String to use on the end of lines when talking to the NNTP server.
|
|
|
|
|
This is \"\\r\\n\" by default, but should be \"\\n\" when
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 157-168)
- Merge from emacs--cvs-trunk--0
- Update from CVS
- Update from CVS: texi/message.texi: Fix default values.
2005-12-08 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/mm-decode.el (mm-discouraged-alternatives): Fix custom type.
Suggest image/.* in the doc string.
2005-12-07 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/mm-decode.el (mm-display-external): Use nametemplate (defined in
RFC1524) if it is in mailcap or add a suffix according to
mailcap-mime-extensions when generating a temp filename; postpone
deleting a temp file for 2 seconds for some wrappers, shell
scripts, and so on, which might exit right after having started a
viewer command as a background job.
2005-12-06 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-art.el (gnus-default-article-saver): Add user-defined
`function' to custom type.
2005-12-02 ARISAWA Akihiro <ari@mbf.ocn.ne.jp> (tiny change)
* lisp/gnus/mm-view.el (mm-inline-text-html-render-with-w3m): Fix misplaced
parens.
2005-11-29 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-cache.el (gnus-cache-rename-group): Wrap doc strings and
long lines.
(gnus-cache-delete-group): Wrap doc strings.
* lisp/gnus/gnus-agent.el (gnus-agent-rename-group)
(gnus-agent-delete-group): Wrap doc strings.
2005-11-24 Pascal Rigaux <pixel@mandriva.com> (tiny change)
* lisp/gnus/rfc2231.el (rfc2231-parse-string): Support non-ascii chars.
2005-11-22 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nnmail.el (nnmail-fancy-expiry-target): Use current-time instead
of current-time-string.
2005-11-20 Stefan Schimanski <schimmi@debian.org> (tiny change)
* lisp/gnus/nnmail.el (nnmail-fancy-expiry-target): Protect against invalid
date header.
2005-11-16 Boris Samorodov <bsam@ipt.ru> (tiny patch)
* lisp/gnus/imap.el (imap-kerberos4-open): Ignore SSL stuff.
2005-11-14 Kevin Greiner <kevin.greiner@compsol.cc>
* lisp/gnus/gnus-agent.el (gnus-agent-article-alist-save-format): Changed
internal variable to a custom variable. Changed default value
from compressed(2) to uncompressed(1).
(gnus-agent-read-agentview): Reversed revision 7.8 to restore
support for uncompressed agentview files. Taken together, reading
the agentview file should now be 6-7 times faster.
(gnus-agent-long-article,
gnus-agent-short-article, gnus-agent-score): Renamed category
keywords to match gnus-cus.
(gnus-agent-summary-fetch-series): Modified to protect against
gnus-agent-summary-fetch-group clearing processable flags.
(gnus-agent-synchronize-group-flags): Update live group buffer as
synchronization may occur due to the user toggling the plugged
status.
(gnus-agent-braid-nov): Now tests new nov entries
for duplicates which are removed. The invalid sort check then
triggers a rescan after the sort as sorting may have moved
duplicate entries such that they can be cheaply detected.
(gnus-agent-read-local): Trivial fix to format of
error message to display actual error condition.
(gnus-agent-save-local): Avoid saving symbols that are bound to
nil as they simply result in a warning message in
gnus-agent-read-local.
(gnus-agent-fetch-group-1): Clear downloadable flag when article
successfully downloaded.
(gnus-agent-regenerate-group): Use
gnus-agent-synchronize-group-flags to reset read status in both
gnus and server.
* lisp/gnus/nntp.el (nntp-end-of-line): Doc fix.
(nntp-authinfo-rejected): New error condition.
(nntp-wait-for): Use new error condition to signal authentication
error.
(nntp-retrieve-data): Rethrow new error condition to break out of
recursive call to nntp-send-authinfo.
2005-11-13 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Use make-local-variable
rather than make-variable-buffer-local for file-precious-flag.
2005-11-13 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Quote file-precious-flag.
2005-11-11 Jan Nieuwenhuizen <janneke@gnu.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Set file-precious-flag,
as a buffer-local variable. This avoids creating truncated
dribble files as a result of a hang up, eg.
2005-11-04 Ken Manheimer <ken.manheimer@gmail.com>
* lisp/gnus/pgg-pgp.el (pgg-pgp-encrypt-region, pgg-pgp-decrypt-region)
(pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
(pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt)
(pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
(pgg-pgp-decrypt-region, pgg-pgp-sign-region): Use new name for
pgg-add-passphrase-to-cache function.
* lisp/gnus/pgg-pgp5.el (pgg-pgp5-encrypt-region, pgg-pgp5-decrypt-region)
(pgg-pgp5-encrypt-symmetric-region, pgg-pgp5-encrypt-symmetric)
(pgg-pgp5-encrypt, pgg-pgp5-decrypt-region, pgg-pgp5-decrypt)
(pgg-pgp5-sign-region, pgg-pgp5-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
(pgg-pgp5-sign-region): Use new name of pgg-add-passphrase-to-cache
function.
2005-10-30 Chong Yidong <cyd@stupidchicken.com>
* lisp/gnus/imap.el (imap-open): Handle case where buffer is a buffer
object.
2005-10-29 Ken Manheimer <ken.manheimer@gmail.com>
* lisp/gnus/pgg-gpg.el (pgg-gpg-select-matching-key): Fix: look at the right
part of the decoded armor to find the key-identifier.
(pgg-gpg-lookup-key-owner): New function to return the
human-readable identifier of a key owner.
(pgg-gpg-lookup-id-from-key-owner): Make it easy to identify the
key itself.
(pgg-gpg-decrypt-region): Prompt with the key owner (rather than
the key value) if we have a key and can match it against a secret
key. Also, added a note pointing out fact that the prompt only
indicates the first matching key.
* lisp/gnus/pgg.el (pgg-decrypt): Passing along 'passphrase' in call to
pgg-decrypt-region.
(pgg-pending-timers): A new hash for tracking the passphrase cache
timers, so that new ones supercede old ones.
(pgg-add-passphrase-to-cache): Rename from
`pgg-add-passphrase-cache' to reduce confusion (all callers
changed). Modified to cancel old timers when new ones are added.
(pgg-remove-passphrase-from-cache): Rename from
`pgg-remove-passphrase-cache' to reduce confusion (all callers
changed). Modified to cancel old timers when their keys are
removed from the cache.
(pgg-cancel-timer): In Emacs, an alias for cancel-timer; in
XEmacs, an indirection to delete-itimer.
(pgg-read-passphrase-from-cache, pgg-read-passphrase):
Extract pgg-read-passphrase-from-cache from pgg-read-passphrase so
users can only check cache without risk of prompting. Correct bug in
notruncate behavior.
(pgg-read-passphrase-from-cache, pgg-read-passphrase)
(pgg-add-passphrase-cache, pgg-remove-passphrase-cache):
Add informative docstrings.
(pgg-decrypt): Convey provided passphrase in subordinate call to
pgg-decrypt-region.
2005-10-20 Ken Manheimer <ken.manheimer+emacs@gmail.com>
* lisp/gnus/pgg.el (pgg-encrypt-region, pgg-encrypt-symmetric-region)
(pgg-encrypt-symmetric, pgg-encrypt, pgg-decrypt-region)
(pgg-decrypt, pgg-sign-region, pgg-sign): Add optional
'passphrase' argument, so the passphrase can be managed externally
and then passed in to the system.
* lisp/gnus/pgg.el (pgg-read-passphrase, pgg-add-passphrase-cache)
(pgg-remove-passphrase-cache): Add optional 'notruncate' argument,
so the passphrase cache can be used reliably with identifiers
besides a pgp packet's key id.
* lisp/gnus/pgg-gpg.el (pgg-pgp-encrypt-region)
(pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
(pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt)
(pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
* lisp/gnus/pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Add optional
'notruncate' argument, so the passphrase cache can be used
reliably with identifiers besides a pgp packet's key id.
2005-10-29 Sascha Wilde <swilde@sha-bang.de>
* lisp/gnus/pgg-gpg.el (pgg-gpg-encrypt-symmetric-region): New function for
symmetric encryption.
(pgg-gpg-symmetric-key-p): New function to check for an symmetric
encrypted session key.
(pgg-gpg-decrypt-region): When decrypting a symmetric encrypted
message ask for the passphrase in a proper way.
* lisp/gnus/pgg.el (pgg-encrypt-symmetric, pgg-encrypt-symmetric-region):
New user commands for symmetric encryption.
2005-12-05 Katsumi Yamaoka <yamaoka@jpl.org>
* man/pgg.texi (User Commands): Fix description of pgg-verify-region.
(Selecting an implementation): Fix descriptions.
2005-11-30 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Various Message Variables): Addition.
2005-11-29 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi: Fix default values.
2005-11-25 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Header Commands): Clarify descriptions of
message-cross-post-followup-to, message-reduce-to-to-cc, and
message-insert-wide-reply.
(Various Commands): Fix kindex for message-kill-to-signature;
clarify description of message-tab.
2005-11-22 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Mailing Lists): Fix description about MFT.
* man/gnus.texi (Emacs Lisp): Use ~/.gnus.el instead of ~/.emacs.
2005-11-17 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Slow Terminal Connection): Replace old description
with new one.
2005-11-16 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Oort Gnus): Use ~/.gnus.el instead of ~/.emacs;
replace X-Draft-Headers with X-Draft-From.
2005-11-14 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Various Various): Fix the default value of
nnheader-max-head-length.
(Gnus Versions): Fix typo.
2005-12-09 08:57:58 +00:00
|
|
|
|
using an indirect connection method (nntp-open-via-*).")
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(defvoo nntp-via-rlogin-command "rsh"
|
|
|
|
|
"*Rlogin command used to connect to an intermediate host.
|
|
|
|
|
This command is used by the `nntp-open-via-rlogin-and-telnet' method.
|
|
|
|
|
The default is \"rsh\", but \"ssh\" is a popular alternative.")
|
1999-02-20 14:05:57 +00:00
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(defvoo nntp-via-rlogin-command-switches nil
|
|
|
|
|
"*Switches given to the rlogin command `nntp-via-rlogin-command'.
|
|
|
|
|
If you use \"ssh\" for `nntp-via-rlogin-command', you may set this to
|
|
|
|
|
\(\"-C\") in order to compress all data connections, otherwise set this
|
|
|
|
|
to \(\"-t\" \"-e\" \"none\") or (\"-C\" \"-t\" \"-e\" \"none\") if the telnet
|
|
|
|
|
command requires a pseudo-tty allocation on an intermediate host.")
|
1999-02-20 14:05:57 +00:00
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(defvoo nntp-via-telnet-command "telnet"
|
|
|
|
|
"*Telnet command used to connect to an intermediate host.
|
|
|
|
|
This command is used by the `nntp-open-via-telnet-and-telnet' method.")
|
1997-09-24 01:50:24 +00:00
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(defvoo nntp-via-telnet-switches '("-8")
|
|
|
|
|
"*Switches given to the telnet command `nntp-via-telnet-command'.")
|
1997-09-24 01:50:24 +00:00
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(defvoo nntp-via-user-name nil
|
|
|
|
|
"*User name to log in on an intermediate host with.
|
|
|
|
|
This variable is used by the `nntp-open-via-telnet-and-telnet' method.")
|
|
|
|
|
|
|
|
|
|
(defvoo nntp-via-user-password nil
|
|
|
|
|
"*Password to use to log in on an intermediate host with.
|
|
|
|
|
This variable is used by the `nntp-open-via-telnet-and-telnet' method.")
|
|
|
|
|
|
|
|
|
|
(defvoo nntp-via-address nil
|
|
|
|
|
"*Address of an intermediate host to connect to.
|
|
|
|
|
This variable is used by the `nntp-open-via-rlogin-and-telnet' and
|
|
|
|
|
`nntp-open-via-telnet-and-telnet' methods.")
|
|
|
|
|
|
|
|
|
|
(defvoo nntp-via-envuser nil
|
|
|
|
|
"*Whether both telnet client and server support the ENVIRON option.
|
|
|
|
|
If non-nil, there will be no prompt for a login name.")
|
|
|
|
|
|
|
|
|
|
(defvoo nntp-via-shell-prompt "bash\\|\$ *\r?$\\|> *\r?"
|
|
|
|
|
"*Regular expression to match the shell prompt on an intermediate host.
|
|
|
|
|
This variable is used by the `nntp-open-via-telnet-and-telnet' method.")
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(defvoo nntp-large-newsgroup 50
|
2004-09-04 13:13:48 +00:00
|
|
|
|
"*The number of articles which indicates a large newsgroup.
|
|
|
|
|
If the number of articles is greater than the value, verbose
|
1997-04-16 22:13:18 +00:00
|
|
|
|
messages will be shown to indicate the current status.")
|
|
|
|
|
|
|
|
|
|
(defvoo nntp-maximum-request 400
|
|
|
|
|
"*The maximum number of the requests sent to the NNTP server at one time.
|
|
|
|
|
If Emacs hangs up while retrieving headers, set the variable to a
|
|
|
|
|
lower value.")
|
|
|
|
|
|
|
|
|
|
(defvoo nntp-nov-is-evil nil
|
|
|
|
|
"*If non-nil, nntp will never attempt to use XOVER when talking to the server.")
|
|
|
|
|
|
|
|
|
|
(defvoo nntp-xover-commands '("XOVER" "XOVERVIEW")
|
|
|
|
|
"*List of strings that are used as commands to fetch NOV lines from a server.
|
|
|
|
|
The strings are tried in turn until a positive response is gotten. If
|
|
|
|
|
none of the commands are successful, nntp will just grab headers one
|
|
|
|
|
by one.")
|
|
|
|
|
|
1997-09-24 01:50:24 +00:00
|
|
|
|
(defvoo nntp-nov-gap 5
|
1997-04-16 22:13:18 +00:00
|
|
|
|
"*Maximum allowed gap between two articles.
|
|
|
|
|
If the gap between two consecutive articles is bigger than this
|
|
|
|
|
variable, split the XOVER request into two requests.")
|
|
|
|
|
|
|
|
|
|
(defvoo nntp-prepare-server-hook nil
|
|
|
|
|
"*Hook run before a server is opened.
|
|
|
|
|
If can be used to set up a server remotely, for instance. Say you
|
|
|
|
|
have an account at the machine \"other.machine\". This machine has
|
|
|
|
|
access to an NNTP server that you can't access locally. You could
|
|
|
|
|
then use this hook to rsh to the remote machine and start a proxy NNTP
|
1999-02-20 14:05:57 +00:00
|
|
|
|
server there that you can connect to. See also
|
|
|
|
|
`nntp-open-connection-function'")
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(defvoo nntp-coding-system-for-read 'binary
|
|
|
|
|
"*Coding system to read from NNTP.")
|
|
|
|
|
|
|
|
|
|
(defvoo nntp-coding-system-for-write 'binary
|
|
|
|
|
"*Coding system to write to NNTP.")
|
|
|
|
|
|
|
|
|
|
(defcustom nntp-authinfo-file "~/.authinfo"
|
|
|
|
|
".netrc-like file that holds nntp authinfo passwords."
|
2004-09-08 18:17:56 +00:00
|
|
|
|
:group 'nntp
|
1999-02-20 14:05:57 +00:00
|
|
|
|
:type
|
|
|
|
|
'(choice file
|
|
|
|
|
(repeat :tag "Entries"
|
|
|
|
|
:menu-tag "Inline"
|
|
|
|
|
(list :format "%v"
|
|
|
|
|
:value ("" ("login" . "") ("password" . ""))
|
|
|
|
|
(string :tag "Host")
|
|
|
|
|
(checklist :inline t
|
|
|
|
|
(cons :format "%v"
|
|
|
|
|
(const :format "" "login")
|
|
|
|
|
(string :format "Login: %v"))
|
|
|
|
|
(cons :format "%v"
|
|
|
|
|
(const :format "" "password")
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(string :format "Password: %v")))))))
|
1999-02-20 14:05:57 +00:00
|
|
|
|
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(defvoo nntp-connection-timeout nil
|
|
|
|
|
"*Number of seconds to wait before an nntp connection times out.
|
2000-11-17 18:23:03 +00:00
|
|
|
|
If this variable is nil, which is the default, no timers are set.
|
|
|
|
|
NOTE: This variable is never seen to work in Emacs 20 and XEmacs 21.")
|
1999-02-20 14:05:57 +00:00
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(defvoo nntp-prepare-post-hook nil
|
|
|
|
|
"*Hook run just before posting an article. It is supposed to be used
|
|
|
|
|
to insert Cancel-Lock headers.")
|
|
|
|
|
|
1997-04-16 22:13:18 +00:00
|
|
|
|
;;; Internal variables.
|
|
|
|
|
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(defvar nntp-record-commands nil
|
|
|
|
|
"*If non-nil, nntp will record all commands in the \"*nntp-log*\" buffer.")
|
|
|
|
|
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(defvar nntp-have-messaged nil)
|
|
|
|
|
|
|
|
|
|
(defvar nntp-process-wait-for nil)
|
|
|
|
|
(defvar nntp-process-to-buffer nil)
|
|
|
|
|
(defvar nntp-process-callback nil)
|
|
|
|
|
(defvar nntp-process-decode nil)
|
|
|
|
|
(defvar nntp-process-start-point nil)
|
|
|
|
|
(defvar nntp-inside-change-function nil)
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(defvoo nntp-last-command-time nil)
|
|
|
|
|
(defvoo nntp-last-command nil)
|
|
|
|
|
(defvoo nntp-authinfo-password nil)
|
|
|
|
|
(defvoo nntp-authinfo-user nil)
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(defvar nntp-connection-list nil)
|
|
|
|
|
|
|
|
|
|
(defvoo nntp-server-type nil)
|
|
|
|
|
(defvoo nntp-connection-alist nil)
|
|
|
|
|
(defvoo nntp-status-string "")
|
|
|
|
|
(defconst nntp-version "nntp 5.0")
|
|
|
|
|
(defvoo nntp-inhibit-erase nil)
|
|
|
|
|
(defvoo nntp-inhibit-output nil)
|
|
|
|
|
|
|
|
|
|
(defvoo nntp-server-xover 'try)
|
|
|
|
|
(defvoo nntp-server-list-active-group 'try)
|
|
|
|
|
|
2000-09-19 13:37:09 +00:00
|
|
|
|
(defvar nntp-async-needs-kluge
|
|
|
|
|
(string-match "^GNU Emacs 20\\.3\\." (emacs-version))
|
|
|
|
|
"*When non-nil, nntp will poll asynchronous connections
|
|
|
|
|
once a second. By default, this is turned on only for Emacs
|
|
|
|
|
20.3, which has a bug that breaks nntp's normal method of
|
|
|
|
|
noticing asynchronous data.")
|
|
|
|
|
|
|
|
|
|
(defvar nntp-async-timer nil)
|
|
|
|
|
(defvar nntp-async-process-list nil)
|
|
|
|
|
|
2005-08-06 19:51:42 +00:00
|
|
|
|
(defvar nntp-ssl-program
|
2003-02-28 13:36:11 +00:00
|
|
|
|
"openssl s_client -quiet -ssl3 -connect %s:%p"
|
|
|
|
|
"A string containing commands for SSL connections.
|
|
|
|
|
Within a string, %s is replaced with the server address and %p with
|
|
|
|
|
port number on server. The program should accept IMAP commands on
|
|
|
|
|
stdin and return responses to stdout.")
|
|
|
|
|
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 157-168)
- Merge from emacs--cvs-trunk--0
- Update from CVS
- Update from CVS: texi/message.texi: Fix default values.
2005-12-08 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/mm-decode.el (mm-discouraged-alternatives): Fix custom type.
Suggest image/.* in the doc string.
2005-12-07 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/mm-decode.el (mm-display-external): Use nametemplate (defined in
RFC1524) if it is in mailcap or add a suffix according to
mailcap-mime-extensions when generating a temp filename; postpone
deleting a temp file for 2 seconds for some wrappers, shell
scripts, and so on, which might exit right after having started a
viewer command as a background job.
2005-12-06 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-art.el (gnus-default-article-saver): Add user-defined
`function' to custom type.
2005-12-02 ARISAWA Akihiro <ari@mbf.ocn.ne.jp> (tiny change)
* lisp/gnus/mm-view.el (mm-inline-text-html-render-with-w3m): Fix misplaced
parens.
2005-11-29 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-cache.el (gnus-cache-rename-group): Wrap doc strings and
long lines.
(gnus-cache-delete-group): Wrap doc strings.
* lisp/gnus/gnus-agent.el (gnus-agent-rename-group)
(gnus-agent-delete-group): Wrap doc strings.
2005-11-24 Pascal Rigaux <pixel@mandriva.com> (tiny change)
* lisp/gnus/rfc2231.el (rfc2231-parse-string): Support non-ascii chars.
2005-11-22 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nnmail.el (nnmail-fancy-expiry-target): Use current-time instead
of current-time-string.
2005-11-20 Stefan Schimanski <schimmi@debian.org> (tiny change)
* lisp/gnus/nnmail.el (nnmail-fancy-expiry-target): Protect against invalid
date header.
2005-11-16 Boris Samorodov <bsam@ipt.ru> (tiny patch)
* lisp/gnus/imap.el (imap-kerberos4-open): Ignore SSL stuff.
2005-11-14 Kevin Greiner <kevin.greiner@compsol.cc>
* lisp/gnus/gnus-agent.el (gnus-agent-article-alist-save-format): Changed
internal variable to a custom variable. Changed default value
from compressed(2) to uncompressed(1).
(gnus-agent-read-agentview): Reversed revision 7.8 to restore
support for uncompressed agentview files. Taken together, reading
the agentview file should now be 6-7 times faster.
(gnus-agent-long-article,
gnus-agent-short-article, gnus-agent-score): Renamed category
keywords to match gnus-cus.
(gnus-agent-summary-fetch-series): Modified to protect against
gnus-agent-summary-fetch-group clearing processable flags.
(gnus-agent-synchronize-group-flags): Update live group buffer as
synchronization may occur due to the user toggling the plugged
status.
(gnus-agent-braid-nov): Now tests new nov entries
for duplicates which are removed. The invalid sort check then
triggers a rescan after the sort as sorting may have moved
duplicate entries such that they can be cheaply detected.
(gnus-agent-read-local): Trivial fix to format of
error message to display actual error condition.
(gnus-agent-save-local): Avoid saving symbols that are bound to
nil as they simply result in a warning message in
gnus-agent-read-local.
(gnus-agent-fetch-group-1): Clear downloadable flag when article
successfully downloaded.
(gnus-agent-regenerate-group): Use
gnus-agent-synchronize-group-flags to reset read status in both
gnus and server.
* lisp/gnus/nntp.el (nntp-end-of-line): Doc fix.
(nntp-authinfo-rejected): New error condition.
(nntp-wait-for): Use new error condition to signal authentication
error.
(nntp-retrieve-data): Rethrow new error condition to break out of
recursive call to nntp-send-authinfo.
2005-11-13 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Use make-local-variable
rather than make-variable-buffer-local for file-precious-flag.
2005-11-13 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Quote file-precious-flag.
2005-11-11 Jan Nieuwenhuizen <janneke@gnu.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Set file-precious-flag,
as a buffer-local variable. This avoids creating truncated
dribble files as a result of a hang up, eg.
2005-11-04 Ken Manheimer <ken.manheimer@gmail.com>
* lisp/gnus/pgg-pgp.el (pgg-pgp-encrypt-region, pgg-pgp-decrypt-region)
(pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
(pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt)
(pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
(pgg-pgp-decrypt-region, pgg-pgp-sign-region): Use new name for
pgg-add-passphrase-to-cache function.
* lisp/gnus/pgg-pgp5.el (pgg-pgp5-encrypt-region, pgg-pgp5-decrypt-region)
(pgg-pgp5-encrypt-symmetric-region, pgg-pgp5-encrypt-symmetric)
(pgg-pgp5-encrypt, pgg-pgp5-decrypt-region, pgg-pgp5-decrypt)
(pgg-pgp5-sign-region, pgg-pgp5-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
(pgg-pgp5-sign-region): Use new name of pgg-add-passphrase-to-cache
function.
2005-10-30 Chong Yidong <cyd@stupidchicken.com>
* lisp/gnus/imap.el (imap-open): Handle case where buffer is a buffer
object.
2005-10-29 Ken Manheimer <ken.manheimer@gmail.com>
* lisp/gnus/pgg-gpg.el (pgg-gpg-select-matching-key): Fix: look at the right
part of the decoded armor to find the key-identifier.
(pgg-gpg-lookup-key-owner): New function to return the
human-readable identifier of a key owner.
(pgg-gpg-lookup-id-from-key-owner): Make it easy to identify the
key itself.
(pgg-gpg-decrypt-region): Prompt with the key owner (rather than
the key value) if we have a key and can match it against a secret
key. Also, added a note pointing out fact that the prompt only
indicates the first matching key.
* lisp/gnus/pgg.el (pgg-decrypt): Passing along 'passphrase' in call to
pgg-decrypt-region.
(pgg-pending-timers): A new hash for tracking the passphrase cache
timers, so that new ones supercede old ones.
(pgg-add-passphrase-to-cache): Rename from
`pgg-add-passphrase-cache' to reduce confusion (all callers
changed). Modified to cancel old timers when new ones are added.
(pgg-remove-passphrase-from-cache): Rename from
`pgg-remove-passphrase-cache' to reduce confusion (all callers
changed). Modified to cancel old timers when their keys are
removed from the cache.
(pgg-cancel-timer): In Emacs, an alias for cancel-timer; in
XEmacs, an indirection to delete-itimer.
(pgg-read-passphrase-from-cache, pgg-read-passphrase):
Extract pgg-read-passphrase-from-cache from pgg-read-passphrase so
users can only check cache without risk of prompting. Correct bug in
notruncate behavior.
(pgg-read-passphrase-from-cache, pgg-read-passphrase)
(pgg-add-passphrase-cache, pgg-remove-passphrase-cache):
Add informative docstrings.
(pgg-decrypt): Convey provided passphrase in subordinate call to
pgg-decrypt-region.
2005-10-20 Ken Manheimer <ken.manheimer+emacs@gmail.com>
* lisp/gnus/pgg.el (pgg-encrypt-region, pgg-encrypt-symmetric-region)
(pgg-encrypt-symmetric, pgg-encrypt, pgg-decrypt-region)
(pgg-decrypt, pgg-sign-region, pgg-sign): Add optional
'passphrase' argument, so the passphrase can be managed externally
and then passed in to the system.
* lisp/gnus/pgg.el (pgg-read-passphrase, pgg-add-passphrase-cache)
(pgg-remove-passphrase-cache): Add optional 'notruncate' argument,
so the passphrase cache can be used reliably with identifiers
besides a pgp packet's key id.
* lisp/gnus/pgg-gpg.el (pgg-pgp-encrypt-region)
(pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
(pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt)
(pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
* lisp/gnus/pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Add optional
'notruncate' argument, so the passphrase cache can be used
reliably with identifiers besides a pgp packet's key id.
2005-10-29 Sascha Wilde <swilde@sha-bang.de>
* lisp/gnus/pgg-gpg.el (pgg-gpg-encrypt-symmetric-region): New function for
symmetric encryption.
(pgg-gpg-symmetric-key-p): New function to check for an symmetric
encrypted session key.
(pgg-gpg-decrypt-region): When decrypting a symmetric encrypted
message ask for the passphrase in a proper way.
* lisp/gnus/pgg.el (pgg-encrypt-symmetric, pgg-encrypt-symmetric-region):
New user commands for symmetric encryption.
2005-12-05 Katsumi Yamaoka <yamaoka@jpl.org>
* man/pgg.texi (User Commands): Fix description of pgg-verify-region.
(Selecting an implementation): Fix descriptions.
2005-11-30 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Various Message Variables): Addition.
2005-11-29 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi: Fix default values.
2005-11-25 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Header Commands): Clarify descriptions of
message-cross-post-followup-to, message-reduce-to-to-cc, and
message-insert-wide-reply.
(Various Commands): Fix kindex for message-kill-to-signature;
clarify description of message-tab.
2005-11-22 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Mailing Lists): Fix description about MFT.
* man/gnus.texi (Emacs Lisp): Use ~/.gnus.el instead of ~/.emacs.
2005-11-17 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Slow Terminal Connection): Replace old description
with new one.
2005-11-16 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Oort Gnus): Use ~/.gnus.el instead of ~/.emacs;
replace X-Draft-Headers with X-Draft-From.
2005-11-14 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Various Various): Fix the default value of
nnheader-max-head-length.
(Gnus Versions): Fix typo.
2005-12-09 08:57:58 +00:00
|
|
|
|
(defvar nntp-authinfo-rejected nil
|
|
|
|
|
"A custom error condition used to report 'Authentication Rejected' errors.
|
|
|
|
|
Condition handlers that match just this condition ensure that the nntp
|
|
|
|
|
backend doesn't catch this error.")
|
|
|
|
|
(put 'nntp-authinfo-rejected 'error-conditions '(error nntp-authinfo-rejected))
|
|
|
|
|
(put 'nntp-authinfo-rejected 'error-message "Authorization Rejected")
|
|
|
|
|
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Internal functions.
|
|
|
|
|
|
|
|
|
|
(defsubst nntp-send-string (process string)
|
|
|
|
|
"Send STRING to PROCESS."
|
1999-02-20 14:05:57 +00:00
|
|
|
|
;; We need to store the time to provide timeouts, and
|
|
|
|
|
;; to store the command so the we can replay the command
|
|
|
|
|
;; if the server gives us an AUTHINFO challenge.
|
|
|
|
|
(setq nntp-last-command-time (current-time)
|
|
|
|
|
nntp-last-command string)
|
|
|
|
|
(when nntp-record-commands
|
|
|
|
|
(nntp-record-command string))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(process-send-string process (concat string nntp-end-of-line))
|
|
|
|
|
(or (memq (process-status process) '(open run))
|
|
|
|
|
(nntp-report "Server closed connection")))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(defun nntp-record-command (string)
|
|
|
|
|
"Record the command STRING."
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer (get-buffer-create "*nntp-log*"))
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(let ((time (current-time)))
|
|
|
|
|
(insert (format-time-string "%Y%m%dT%H%M%S" time)
|
|
|
|
|
"." (format "%03d" (/ (nth 2 time) 1000))
|
|
|
|
|
" " nntp-address " " string "\n"))))
|
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(defun nntp-report (&rest args)
|
|
|
|
|
"Report an error from the nntp backend. The first string in ARGS
|
|
|
|
|
can be a format string. For some commands, the failed command may be
|
|
|
|
|
retried once before actually displaying the error report."
|
|
|
|
|
|
|
|
|
|
(when nntp-record-commands
|
|
|
|
|
(nntp-record-command "*** CALLED nntp-report ***"))
|
|
|
|
|
|
|
|
|
|
(nnheader-report 'nntp args)
|
|
|
|
|
|
|
|
|
|
(apply 'error args))
|
|
|
|
|
|
|
|
|
|
(defun nntp-report-1 (&rest args)
|
|
|
|
|
"Throws out to nntp-with-open-group-error so that the connection may
|
|
|
|
|
be restored and the command retried."
|
|
|
|
|
|
|
|
|
|
(when nntp-record-commands
|
|
|
|
|
(nntp-record-command "*** CONNECTION LOST ***"))
|
|
|
|
|
|
|
|
|
|
(throw 'nntp-with-open-group-error t))
|
|
|
|
|
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(defsubst nntp-wait-for (process wait-for buffer &optional decode discard)
|
|
|
|
|
"Wait for WAIT-FOR to arrive from PROCESS."
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer (process-buffer process))
|
|
|
|
|
(goto-char (point-min))
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(while (and (or (not (memq (char-after (point)) '(?2 ?3 ?4 ?5)))
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 157-168)
- Merge from emacs--cvs-trunk--0
- Update from CVS
- Update from CVS: texi/message.texi: Fix default values.
2005-12-08 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/mm-decode.el (mm-discouraged-alternatives): Fix custom type.
Suggest image/.* in the doc string.
2005-12-07 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/mm-decode.el (mm-display-external): Use nametemplate (defined in
RFC1524) if it is in mailcap or add a suffix according to
mailcap-mime-extensions when generating a temp filename; postpone
deleting a temp file for 2 seconds for some wrappers, shell
scripts, and so on, which might exit right after having started a
viewer command as a background job.
2005-12-06 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-art.el (gnus-default-article-saver): Add user-defined
`function' to custom type.
2005-12-02 ARISAWA Akihiro <ari@mbf.ocn.ne.jp> (tiny change)
* lisp/gnus/mm-view.el (mm-inline-text-html-render-with-w3m): Fix misplaced
parens.
2005-11-29 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-cache.el (gnus-cache-rename-group): Wrap doc strings and
long lines.
(gnus-cache-delete-group): Wrap doc strings.
* lisp/gnus/gnus-agent.el (gnus-agent-rename-group)
(gnus-agent-delete-group): Wrap doc strings.
2005-11-24 Pascal Rigaux <pixel@mandriva.com> (tiny change)
* lisp/gnus/rfc2231.el (rfc2231-parse-string): Support non-ascii chars.
2005-11-22 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nnmail.el (nnmail-fancy-expiry-target): Use current-time instead
of current-time-string.
2005-11-20 Stefan Schimanski <schimmi@debian.org> (tiny change)
* lisp/gnus/nnmail.el (nnmail-fancy-expiry-target): Protect against invalid
date header.
2005-11-16 Boris Samorodov <bsam@ipt.ru> (tiny patch)
* lisp/gnus/imap.el (imap-kerberos4-open): Ignore SSL stuff.
2005-11-14 Kevin Greiner <kevin.greiner@compsol.cc>
* lisp/gnus/gnus-agent.el (gnus-agent-article-alist-save-format): Changed
internal variable to a custom variable. Changed default value
from compressed(2) to uncompressed(1).
(gnus-agent-read-agentview): Reversed revision 7.8 to restore
support for uncompressed agentview files. Taken together, reading
the agentview file should now be 6-7 times faster.
(gnus-agent-long-article,
gnus-agent-short-article, gnus-agent-score): Renamed category
keywords to match gnus-cus.
(gnus-agent-summary-fetch-series): Modified to protect against
gnus-agent-summary-fetch-group clearing processable flags.
(gnus-agent-synchronize-group-flags): Update live group buffer as
synchronization may occur due to the user toggling the plugged
status.
(gnus-agent-braid-nov): Now tests new nov entries
for duplicates which are removed. The invalid sort check then
triggers a rescan after the sort as sorting may have moved
duplicate entries such that they can be cheaply detected.
(gnus-agent-read-local): Trivial fix to format of
error message to display actual error condition.
(gnus-agent-save-local): Avoid saving symbols that are bound to
nil as they simply result in a warning message in
gnus-agent-read-local.
(gnus-agent-fetch-group-1): Clear downloadable flag when article
successfully downloaded.
(gnus-agent-regenerate-group): Use
gnus-agent-synchronize-group-flags to reset read status in both
gnus and server.
* lisp/gnus/nntp.el (nntp-end-of-line): Doc fix.
(nntp-authinfo-rejected): New error condition.
(nntp-wait-for): Use new error condition to signal authentication
error.
(nntp-retrieve-data): Rethrow new error condition to break out of
recursive call to nntp-send-authinfo.
2005-11-13 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Use make-local-variable
rather than make-variable-buffer-local for file-precious-flag.
2005-11-13 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Quote file-precious-flag.
2005-11-11 Jan Nieuwenhuizen <janneke@gnu.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Set file-precious-flag,
as a buffer-local variable. This avoids creating truncated
dribble files as a result of a hang up, eg.
2005-11-04 Ken Manheimer <ken.manheimer@gmail.com>
* lisp/gnus/pgg-pgp.el (pgg-pgp-encrypt-region, pgg-pgp-decrypt-region)
(pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
(pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt)
(pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
(pgg-pgp-decrypt-region, pgg-pgp-sign-region): Use new name for
pgg-add-passphrase-to-cache function.
* lisp/gnus/pgg-pgp5.el (pgg-pgp5-encrypt-region, pgg-pgp5-decrypt-region)
(pgg-pgp5-encrypt-symmetric-region, pgg-pgp5-encrypt-symmetric)
(pgg-pgp5-encrypt, pgg-pgp5-decrypt-region, pgg-pgp5-decrypt)
(pgg-pgp5-sign-region, pgg-pgp5-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
(pgg-pgp5-sign-region): Use new name of pgg-add-passphrase-to-cache
function.
2005-10-30 Chong Yidong <cyd@stupidchicken.com>
* lisp/gnus/imap.el (imap-open): Handle case where buffer is a buffer
object.
2005-10-29 Ken Manheimer <ken.manheimer@gmail.com>
* lisp/gnus/pgg-gpg.el (pgg-gpg-select-matching-key): Fix: look at the right
part of the decoded armor to find the key-identifier.
(pgg-gpg-lookup-key-owner): New function to return the
human-readable identifier of a key owner.
(pgg-gpg-lookup-id-from-key-owner): Make it easy to identify the
key itself.
(pgg-gpg-decrypt-region): Prompt with the key owner (rather than
the key value) if we have a key and can match it against a secret
key. Also, added a note pointing out fact that the prompt only
indicates the first matching key.
* lisp/gnus/pgg.el (pgg-decrypt): Passing along 'passphrase' in call to
pgg-decrypt-region.
(pgg-pending-timers): A new hash for tracking the passphrase cache
timers, so that new ones supercede old ones.
(pgg-add-passphrase-to-cache): Rename from
`pgg-add-passphrase-cache' to reduce confusion (all callers
changed). Modified to cancel old timers when new ones are added.
(pgg-remove-passphrase-from-cache): Rename from
`pgg-remove-passphrase-cache' to reduce confusion (all callers
changed). Modified to cancel old timers when their keys are
removed from the cache.
(pgg-cancel-timer): In Emacs, an alias for cancel-timer; in
XEmacs, an indirection to delete-itimer.
(pgg-read-passphrase-from-cache, pgg-read-passphrase):
Extract pgg-read-passphrase-from-cache from pgg-read-passphrase so
users can only check cache without risk of prompting. Correct bug in
notruncate behavior.
(pgg-read-passphrase-from-cache, pgg-read-passphrase)
(pgg-add-passphrase-cache, pgg-remove-passphrase-cache):
Add informative docstrings.
(pgg-decrypt): Convey provided passphrase in subordinate call to
pgg-decrypt-region.
2005-10-20 Ken Manheimer <ken.manheimer+emacs@gmail.com>
* lisp/gnus/pgg.el (pgg-encrypt-region, pgg-encrypt-symmetric-region)
(pgg-encrypt-symmetric, pgg-encrypt, pgg-decrypt-region)
(pgg-decrypt, pgg-sign-region, pgg-sign): Add optional
'passphrase' argument, so the passphrase can be managed externally
and then passed in to the system.
* lisp/gnus/pgg.el (pgg-read-passphrase, pgg-add-passphrase-cache)
(pgg-remove-passphrase-cache): Add optional 'notruncate' argument,
so the passphrase cache can be used reliably with identifiers
besides a pgp packet's key id.
* lisp/gnus/pgg-gpg.el (pgg-pgp-encrypt-region)
(pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
(pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt)
(pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
* lisp/gnus/pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Add optional
'notruncate' argument, so the passphrase cache can be used
reliably with identifiers besides a pgp packet's key id.
2005-10-29 Sascha Wilde <swilde@sha-bang.de>
* lisp/gnus/pgg-gpg.el (pgg-gpg-encrypt-symmetric-region): New function for
symmetric encryption.
(pgg-gpg-symmetric-key-p): New function to check for an symmetric
encrypted session key.
(pgg-gpg-decrypt-region): When decrypting a symmetric encrypted
message ask for the passphrase in a proper way.
* lisp/gnus/pgg.el (pgg-encrypt-symmetric, pgg-encrypt-symmetric-region):
New user commands for symmetric encryption.
2005-12-05 Katsumi Yamaoka <yamaoka@jpl.org>
* man/pgg.texi (User Commands): Fix description of pgg-verify-region.
(Selecting an implementation): Fix descriptions.
2005-11-30 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Various Message Variables): Addition.
2005-11-29 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi: Fix default values.
2005-11-25 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Header Commands): Clarify descriptions of
message-cross-post-followup-to, message-reduce-to-to-cc, and
message-insert-wide-reply.
(Various Commands): Fix kindex for message-kill-to-signature;
clarify description of message-tab.
2005-11-22 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Mailing Lists): Fix description about MFT.
* man/gnus.texi (Emacs Lisp): Use ~/.gnus.el instead of ~/.emacs.
2005-11-17 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Slow Terminal Connection): Replace old description
with new one.
2005-11-16 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Oort Gnus): Use ~/.gnus.el instead of ~/.emacs;
replace X-Draft-Headers with X-Draft-From.
2005-11-14 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Various Various): Fix the default value of
nnheader-max-head-length.
(Gnus Versions): Fix typo.
2005-12-09 08:57:58 +00:00
|
|
|
|
(looking-at "48[02]"))
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(memq (process-status process) '(open run)))
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 157-168)
- Merge from emacs--cvs-trunk--0
- Update from CVS
- Update from CVS: texi/message.texi: Fix default values.
2005-12-08 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/mm-decode.el (mm-discouraged-alternatives): Fix custom type.
Suggest image/.* in the doc string.
2005-12-07 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/mm-decode.el (mm-display-external): Use nametemplate (defined in
RFC1524) if it is in mailcap or add a suffix according to
mailcap-mime-extensions when generating a temp filename; postpone
deleting a temp file for 2 seconds for some wrappers, shell
scripts, and so on, which might exit right after having started a
viewer command as a background job.
2005-12-06 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-art.el (gnus-default-article-saver): Add user-defined
`function' to custom type.
2005-12-02 ARISAWA Akihiro <ari@mbf.ocn.ne.jp> (tiny change)
* lisp/gnus/mm-view.el (mm-inline-text-html-render-with-w3m): Fix misplaced
parens.
2005-11-29 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-cache.el (gnus-cache-rename-group): Wrap doc strings and
long lines.
(gnus-cache-delete-group): Wrap doc strings.
* lisp/gnus/gnus-agent.el (gnus-agent-rename-group)
(gnus-agent-delete-group): Wrap doc strings.
2005-11-24 Pascal Rigaux <pixel@mandriva.com> (tiny change)
* lisp/gnus/rfc2231.el (rfc2231-parse-string): Support non-ascii chars.
2005-11-22 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nnmail.el (nnmail-fancy-expiry-target): Use current-time instead
of current-time-string.
2005-11-20 Stefan Schimanski <schimmi@debian.org> (tiny change)
* lisp/gnus/nnmail.el (nnmail-fancy-expiry-target): Protect against invalid
date header.
2005-11-16 Boris Samorodov <bsam@ipt.ru> (tiny patch)
* lisp/gnus/imap.el (imap-kerberos4-open): Ignore SSL stuff.
2005-11-14 Kevin Greiner <kevin.greiner@compsol.cc>
* lisp/gnus/gnus-agent.el (gnus-agent-article-alist-save-format): Changed
internal variable to a custom variable. Changed default value
from compressed(2) to uncompressed(1).
(gnus-agent-read-agentview): Reversed revision 7.8 to restore
support for uncompressed agentview files. Taken together, reading
the agentview file should now be 6-7 times faster.
(gnus-agent-long-article,
gnus-agent-short-article, gnus-agent-score): Renamed category
keywords to match gnus-cus.
(gnus-agent-summary-fetch-series): Modified to protect against
gnus-agent-summary-fetch-group clearing processable flags.
(gnus-agent-synchronize-group-flags): Update live group buffer as
synchronization may occur due to the user toggling the plugged
status.
(gnus-agent-braid-nov): Now tests new nov entries
for duplicates which are removed. The invalid sort check then
triggers a rescan after the sort as sorting may have moved
duplicate entries such that they can be cheaply detected.
(gnus-agent-read-local): Trivial fix to format of
error message to display actual error condition.
(gnus-agent-save-local): Avoid saving symbols that are bound to
nil as they simply result in a warning message in
gnus-agent-read-local.
(gnus-agent-fetch-group-1): Clear downloadable flag when article
successfully downloaded.
(gnus-agent-regenerate-group): Use
gnus-agent-synchronize-group-flags to reset read status in both
gnus and server.
* lisp/gnus/nntp.el (nntp-end-of-line): Doc fix.
(nntp-authinfo-rejected): New error condition.
(nntp-wait-for): Use new error condition to signal authentication
error.
(nntp-retrieve-data): Rethrow new error condition to break out of
recursive call to nntp-send-authinfo.
2005-11-13 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Use make-local-variable
rather than make-variable-buffer-local for file-precious-flag.
2005-11-13 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Quote file-precious-flag.
2005-11-11 Jan Nieuwenhuizen <janneke@gnu.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Set file-precious-flag,
as a buffer-local variable. This avoids creating truncated
dribble files as a result of a hang up, eg.
2005-11-04 Ken Manheimer <ken.manheimer@gmail.com>
* lisp/gnus/pgg-pgp.el (pgg-pgp-encrypt-region, pgg-pgp-decrypt-region)
(pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
(pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt)
(pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
(pgg-pgp-decrypt-region, pgg-pgp-sign-region): Use new name for
pgg-add-passphrase-to-cache function.
* lisp/gnus/pgg-pgp5.el (pgg-pgp5-encrypt-region, pgg-pgp5-decrypt-region)
(pgg-pgp5-encrypt-symmetric-region, pgg-pgp5-encrypt-symmetric)
(pgg-pgp5-encrypt, pgg-pgp5-decrypt-region, pgg-pgp5-decrypt)
(pgg-pgp5-sign-region, pgg-pgp5-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
(pgg-pgp5-sign-region): Use new name of pgg-add-passphrase-to-cache
function.
2005-10-30 Chong Yidong <cyd@stupidchicken.com>
* lisp/gnus/imap.el (imap-open): Handle case where buffer is a buffer
object.
2005-10-29 Ken Manheimer <ken.manheimer@gmail.com>
* lisp/gnus/pgg-gpg.el (pgg-gpg-select-matching-key): Fix: look at the right
part of the decoded armor to find the key-identifier.
(pgg-gpg-lookup-key-owner): New function to return the
human-readable identifier of a key owner.
(pgg-gpg-lookup-id-from-key-owner): Make it easy to identify the
key itself.
(pgg-gpg-decrypt-region): Prompt with the key owner (rather than
the key value) if we have a key and can match it against a secret
key. Also, added a note pointing out fact that the prompt only
indicates the first matching key.
* lisp/gnus/pgg.el (pgg-decrypt): Passing along 'passphrase' in call to
pgg-decrypt-region.
(pgg-pending-timers): A new hash for tracking the passphrase cache
timers, so that new ones supercede old ones.
(pgg-add-passphrase-to-cache): Rename from
`pgg-add-passphrase-cache' to reduce confusion (all callers
changed). Modified to cancel old timers when new ones are added.
(pgg-remove-passphrase-from-cache): Rename from
`pgg-remove-passphrase-cache' to reduce confusion (all callers
changed). Modified to cancel old timers when their keys are
removed from the cache.
(pgg-cancel-timer): In Emacs, an alias for cancel-timer; in
XEmacs, an indirection to delete-itimer.
(pgg-read-passphrase-from-cache, pgg-read-passphrase):
Extract pgg-read-passphrase-from-cache from pgg-read-passphrase so
users can only check cache without risk of prompting. Correct bug in
notruncate behavior.
(pgg-read-passphrase-from-cache, pgg-read-passphrase)
(pgg-add-passphrase-cache, pgg-remove-passphrase-cache):
Add informative docstrings.
(pgg-decrypt): Convey provided passphrase in subordinate call to
pgg-decrypt-region.
2005-10-20 Ken Manheimer <ken.manheimer+emacs@gmail.com>
* lisp/gnus/pgg.el (pgg-encrypt-region, pgg-encrypt-symmetric-region)
(pgg-encrypt-symmetric, pgg-encrypt, pgg-decrypt-region)
(pgg-decrypt, pgg-sign-region, pgg-sign): Add optional
'passphrase' argument, so the passphrase can be managed externally
and then passed in to the system.
* lisp/gnus/pgg.el (pgg-read-passphrase, pgg-add-passphrase-cache)
(pgg-remove-passphrase-cache): Add optional 'notruncate' argument,
so the passphrase cache can be used reliably with identifiers
besides a pgp packet's key id.
* lisp/gnus/pgg-gpg.el (pgg-pgp-encrypt-region)
(pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
(pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt)
(pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
* lisp/gnus/pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Add optional
'notruncate' argument, so the passphrase cache can be used
reliably with identifiers besides a pgp packet's key id.
2005-10-29 Sascha Wilde <swilde@sha-bang.de>
* lisp/gnus/pgg-gpg.el (pgg-gpg-encrypt-symmetric-region): New function for
symmetric encryption.
(pgg-gpg-symmetric-key-p): New function to check for an symmetric
encrypted session key.
(pgg-gpg-decrypt-region): When decrypting a symmetric encrypted
message ask for the passphrase in a proper way.
* lisp/gnus/pgg.el (pgg-encrypt-symmetric, pgg-encrypt-symmetric-region):
New user commands for symmetric encryption.
2005-12-05 Katsumi Yamaoka <yamaoka@jpl.org>
* man/pgg.texi (User Commands): Fix description of pgg-verify-region.
(Selecting an implementation): Fix descriptions.
2005-11-30 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Various Message Variables): Addition.
2005-11-29 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi: Fix default values.
2005-11-25 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Header Commands): Clarify descriptions of
message-cross-post-followup-to, message-reduce-to-to-cc, and
message-insert-wide-reply.
(Various Commands): Fix kindex for message-kill-to-signature;
clarify description of message-tab.
2005-11-22 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Mailing Lists): Fix description about MFT.
* man/gnus.texi (Emacs Lisp): Use ~/.gnus.el instead of ~/.emacs.
2005-11-17 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Slow Terminal Connection): Replace old description
with new one.
2005-11-16 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Oort Gnus): Use ~/.gnus.el instead of ~/.emacs;
replace X-Draft-Headers with X-Draft-From.
2005-11-14 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Various Various): Fix the default value of
nnheader-max-head-length.
(Gnus Versions): Fix typo.
2005-12-09 08:57:58 +00:00
|
|
|
|
(cond ((looking-at "480")
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(nntp-handle-authinfo process))
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 157-168)
- Merge from emacs--cvs-trunk--0
- Update from CVS
- Update from CVS: texi/message.texi: Fix default values.
2005-12-08 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/mm-decode.el (mm-discouraged-alternatives): Fix custom type.
Suggest image/.* in the doc string.
2005-12-07 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/mm-decode.el (mm-display-external): Use nametemplate (defined in
RFC1524) if it is in mailcap or add a suffix according to
mailcap-mime-extensions when generating a temp filename; postpone
deleting a temp file for 2 seconds for some wrappers, shell
scripts, and so on, which might exit right after having started a
viewer command as a background job.
2005-12-06 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-art.el (gnus-default-article-saver): Add user-defined
`function' to custom type.
2005-12-02 ARISAWA Akihiro <ari@mbf.ocn.ne.jp> (tiny change)
* lisp/gnus/mm-view.el (mm-inline-text-html-render-with-w3m): Fix misplaced
parens.
2005-11-29 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-cache.el (gnus-cache-rename-group): Wrap doc strings and
long lines.
(gnus-cache-delete-group): Wrap doc strings.
* lisp/gnus/gnus-agent.el (gnus-agent-rename-group)
(gnus-agent-delete-group): Wrap doc strings.
2005-11-24 Pascal Rigaux <pixel@mandriva.com> (tiny change)
* lisp/gnus/rfc2231.el (rfc2231-parse-string): Support non-ascii chars.
2005-11-22 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nnmail.el (nnmail-fancy-expiry-target): Use current-time instead
of current-time-string.
2005-11-20 Stefan Schimanski <schimmi@debian.org> (tiny change)
* lisp/gnus/nnmail.el (nnmail-fancy-expiry-target): Protect against invalid
date header.
2005-11-16 Boris Samorodov <bsam@ipt.ru> (tiny patch)
* lisp/gnus/imap.el (imap-kerberos4-open): Ignore SSL stuff.
2005-11-14 Kevin Greiner <kevin.greiner@compsol.cc>
* lisp/gnus/gnus-agent.el (gnus-agent-article-alist-save-format): Changed
internal variable to a custom variable. Changed default value
from compressed(2) to uncompressed(1).
(gnus-agent-read-agentview): Reversed revision 7.8 to restore
support for uncompressed agentview files. Taken together, reading
the agentview file should now be 6-7 times faster.
(gnus-agent-long-article,
gnus-agent-short-article, gnus-agent-score): Renamed category
keywords to match gnus-cus.
(gnus-agent-summary-fetch-series): Modified to protect against
gnus-agent-summary-fetch-group clearing processable flags.
(gnus-agent-synchronize-group-flags): Update live group buffer as
synchronization may occur due to the user toggling the plugged
status.
(gnus-agent-braid-nov): Now tests new nov entries
for duplicates which are removed. The invalid sort check then
triggers a rescan after the sort as sorting may have moved
duplicate entries such that they can be cheaply detected.
(gnus-agent-read-local): Trivial fix to format of
error message to display actual error condition.
(gnus-agent-save-local): Avoid saving symbols that are bound to
nil as they simply result in a warning message in
gnus-agent-read-local.
(gnus-agent-fetch-group-1): Clear downloadable flag when article
successfully downloaded.
(gnus-agent-regenerate-group): Use
gnus-agent-synchronize-group-flags to reset read status in both
gnus and server.
* lisp/gnus/nntp.el (nntp-end-of-line): Doc fix.
(nntp-authinfo-rejected): New error condition.
(nntp-wait-for): Use new error condition to signal authentication
error.
(nntp-retrieve-data): Rethrow new error condition to break out of
recursive call to nntp-send-authinfo.
2005-11-13 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Use make-local-variable
rather than make-variable-buffer-local for file-precious-flag.
2005-11-13 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Quote file-precious-flag.
2005-11-11 Jan Nieuwenhuizen <janneke@gnu.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Set file-precious-flag,
as a buffer-local variable. This avoids creating truncated
dribble files as a result of a hang up, eg.
2005-11-04 Ken Manheimer <ken.manheimer@gmail.com>
* lisp/gnus/pgg-pgp.el (pgg-pgp-encrypt-region, pgg-pgp-decrypt-region)
(pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
(pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt)
(pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
(pgg-pgp-decrypt-region, pgg-pgp-sign-region): Use new name for
pgg-add-passphrase-to-cache function.
* lisp/gnus/pgg-pgp5.el (pgg-pgp5-encrypt-region, pgg-pgp5-decrypt-region)
(pgg-pgp5-encrypt-symmetric-region, pgg-pgp5-encrypt-symmetric)
(pgg-pgp5-encrypt, pgg-pgp5-decrypt-region, pgg-pgp5-decrypt)
(pgg-pgp5-sign-region, pgg-pgp5-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
(pgg-pgp5-sign-region): Use new name of pgg-add-passphrase-to-cache
function.
2005-10-30 Chong Yidong <cyd@stupidchicken.com>
* lisp/gnus/imap.el (imap-open): Handle case where buffer is a buffer
object.
2005-10-29 Ken Manheimer <ken.manheimer@gmail.com>
* lisp/gnus/pgg-gpg.el (pgg-gpg-select-matching-key): Fix: look at the right
part of the decoded armor to find the key-identifier.
(pgg-gpg-lookup-key-owner): New function to return the
human-readable identifier of a key owner.
(pgg-gpg-lookup-id-from-key-owner): Make it easy to identify the
key itself.
(pgg-gpg-decrypt-region): Prompt with the key owner (rather than
the key value) if we have a key and can match it against a secret
key. Also, added a note pointing out fact that the prompt only
indicates the first matching key.
* lisp/gnus/pgg.el (pgg-decrypt): Passing along 'passphrase' in call to
pgg-decrypt-region.
(pgg-pending-timers): A new hash for tracking the passphrase cache
timers, so that new ones supercede old ones.
(pgg-add-passphrase-to-cache): Rename from
`pgg-add-passphrase-cache' to reduce confusion (all callers
changed). Modified to cancel old timers when new ones are added.
(pgg-remove-passphrase-from-cache): Rename from
`pgg-remove-passphrase-cache' to reduce confusion (all callers
changed). Modified to cancel old timers when their keys are
removed from the cache.
(pgg-cancel-timer): In Emacs, an alias for cancel-timer; in
XEmacs, an indirection to delete-itimer.
(pgg-read-passphrase-from-cache, pgg-read-passphrase):
Extract pgg-read-passphrase-from-cache from pgg-read-passphrase so
users can only check cache without risk of prompting. Correct bug in
notruncate behavior.
(pgg-read-passphrase-from-cache, pgg-read-passphrase)
(pgg-add-passphrase-cache, pgg-remove-passphrase-cache):
Add informative docstrings.
(pgg-decrypt): Convey provided passphrase in subordinate call to
pgg-decrypt-region.
2005-10-20 Ken Manheimer <ken.manheimer+emacs@gmail.com>
* lisp/gnus/pgg.el (pgg-encrypt-region, pgg-encrypt-symmetric-region)
(pgg-encrypt-symmetric, pgg-encrypt, pgg-decrypt-region)
(pgg-decrypt, pgg-sign-region, pgg-sign): Add optional
'passphrase' argument, so the passphrase can be managed externally
and then passed in to the system.
* lisp/gnus/pgg.el (pgg-read-passphrase, pgg-add-passphrase-cache)
(pgg-remove-passphrase-cache): Add optional 'notruncate' argument,
so the passphrase cache can be used reliably with identifiers
besides a pgp packet's key id.
* lisp/gnus/pgg-gpg.el (pgg-pgp-encrypt-region)
(pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
(pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt)
(pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
* lisp/gnus/pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Add optional
'notruncate' argument, so the passphrase cache can be used
reliably with identifiers besides a pgp packet's key id.
2005-10-29 Sascha Wilde <swilde@sha-bang.de>
* lisp/gnus/pgg-gpg.el (pgg-gpg-encrypt-symmetric-region): New function for
symmetric encryption.
(pgg-gpg-symmetric-key-p): New function to check for an symmetric
encrypted session key.
(pgg-gpg-decrypt-region): When decrypting a symmetric encrypted
message ask for the passphrase in a proper way.
* lisp/gnus/pgg.el (pgg-encrypt-symmetric, pgg-encrypt-symmetric-region):
New user commands for symmetric encryption.
2005-12-05 Katsumi Yamaoka <yamaoka@jpl.org>
* man/pgg.texi (User Commands): Fix description of pgg-verify-region.
(Selecting an implementation): Fix descriptions.
2005-11-30 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Various Message Variables): Addition.
2005-11-29 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi: Fix default values.
2005-11-25 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Header Commands): Clarify descriptions of
message-cross-post-followup-to, message-reduce-to-to-cc, and
message-insert-wide-reply.
(Various Commands): Fix kindex for message-kill-to-signature;
clarify description of message-tab.
2005-11-22 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Mailing Lists): Fix description about MFT.
* man/gnus.texi (Emacs Lisp): Use ~/.gnus.el instead of ~/.emacs.
2005-11-17 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Slow Terminal Connection): Replace old description
with new one.
2005-11-16 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Oort Gnus): Use ~/.gnus.el instead of ~/.emacs;
replace X-Draft-Headers with X-Draft-From.
2005-11-14 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Various Various): Fix the default value of
nnheader-max-head-length.
(Gnus Versions): Fix typo.
2005-12-09 08:57:58 +00:00
|
|
|
|
((looking-at "482")
|
|
|
|
|
(nnheader-report 'nntp (get 'nntp-authinfo-rejected 'error-message))
|
|
|
|
|
(signal 'nntp-authinfo-rejected nil))
|
|
|
|
|
((looking-at "^.*\n")
|
|
|
|
|
(delete-region (point) (progn (forward-line 1) (point)))))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(nntp-accept-process-output process)
|
|
|
|
|
(goto-char (point-min)))
|
|
|
|
|
(prog1
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(cond
|
|
|
|
|
((looking-at "[45]")
|
|
|
|
|
(progn
|
|
|
|
|
(nntp-snarf-error-message)
|
|
|
|
|
nil))
|
|
|
|
|
((not (memq (process-status process) '(open run)))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(nntp-report "Server closed connection"))
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(t
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(goto-char (point-max))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(let ((limit (point-min))
|
|
|
|
|
response)
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(while (not (re-search-backward wait-for limit t))
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(nntp-accept-process-output process)
|
1997-04-16 22:13:18 +00:00
|
|
|
|
;; We assume that whatever we wait for is less than 1000
|
|
|
|
|
;; characters long.
|
|
|
|
|
(setq limit (max (- (point-max) 1000) (point-min)))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(goto-char (point-max)))
|
|
|
|
|
(setq response (match-string 0))
|
|
|
|
|
(with-current-buffer nntp-server-buffer
|
|
|
|
|
(setq nntp-process-response response)))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(nntp-decode-text (not decode))
|
|
|
|
|
(unless discard
|
|
|
|
|
(save-excursion
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(set-buffer buffer)
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(insert-buffer-substring (process-buffer process))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
;; Nix out "nntp reading...." message.
|
|
|
|
|
(when nntp-have-messaged
|
|
|
|
|
(setq nntp-have-messaged nil)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(nnheader-message 5 ""))))
|
|
|
|
|
t))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(unless discard
|
|
|
|
|
(erase-buffer)))))
|
|
|
|
|
|
2000-09-19 13:37:09 +00:00
|
|
|
|
(defun nntp-kill-buffer (buffer)
|
|
|
|
|
(when (buffer-name buffer)
|
|
|
|
|
(kill-buffer buffer)
|
|
|
|
|
(nnheader-init-server-buffer)))
|
|
|
|
|
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(defsubst nntp-find-connection (buffer)
|
|
|
|
|
"Find the connection delivering to BUFFER."
|
|
|
|
|
(let ((alist nntp-connection-alist)
|
|
|
|
|
(buffer (if (stringp buffer) (get-buffer buffer) buffer))
|
|
|
|
|
process entry)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(while (and alist (setq entry (pop alist)))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(when (eq buffer (cadr entry))
|
|
|
|
|
(setq process (car entry)
|
|
|
|
|
alist nil)))
|
|
|
|
|
(when process
|
|
|
|
|
(if (memq (process-status process) '(open run))
|
|
|
|
|
process
|
2000-09-19 13:37:09 +00:00
|
|
|
|
(nntp-kill-buffer (process-buffer process))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(setq nntp-connection-alist (delq entry nntp-connection-alist))
|
|
|
|
|
nil))))
|
|
|
|
|
|
|
|
|
|
(defsubst nntp-find-connection-entry (buffer)
|
|
|
|
|
"Return the entry for the connection to BUFFER."
|
|
|
|
|
(assq (nntp-find-connection buffer) nntp-connection-alist))
|
|
|
|
|
|
|
|
|
|
(defun nntp-find-connection-buffer (buffer)
|
|
|
|
|
"Return the process connection buffer tied to BUFFER."
|
|
|
|
|
(let ((process (nntp-find-connection buffer)))
|
|
|
|
|
(when process
|
|
|
|
|
(process-buffer process))))
|
|
|
|
|
|
|
|
|
|
(defsubst nntp-retrieve-data (command address port buffer
|
1999-02-20 14:05:57 +00:00
|
|
|
|
&optional wait-for callback decode)
|
1997-04-16 22:13:18 +00:00
|
|
|
|
"Use COMMAND to retrieve data into BUFFER from PORT on ADDRESS."
|
|
|
|
|
(let ((process (or (nntp-find-connection buffer)
|
|
|
|
|
(nntp-open-connection buffer))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(if process
|
|
|
|
|
(progn
|
|
|
|
|
(unless (or nntp-inhibit-erase nnheader-callback-function)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer (process-buffer process))
|
|
|
|
|
(erase-buffer)))
|
|
|
|
|
(condition-case err
|
|
|
|
|
(progn
|
|
|
|
|
(when command
|
|
|
|
|
(nntp-send-string process command))
|
|
|
|
|
(cond
|
|
|
|
|
((eq callback 'ignore)
|
|
|
|
|
t)
|
|
|
|
|
((and callback wait-for)
|
|
|
|
|
(nntp-async-wait process wait-for buffer decode callback)
|
|
|
|
|
t)
|
|
|
|
|
(wait-for
|
|
|
|
|
(nntp-wait-for process wait-for buffer decode))
|
|
|
|
|
(t t)))
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 157-168)
- Merge from emacs--cvs-trunk--0
- Update from CVS
- Update from CVS: texi/message.texi: Fix default values.
2005-12-08 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/mm-decode.el (mm-discouraged-alternatives): Fix custom type.
Suggest image/.* in the doc string.
2005-12-07 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/mm-decode.el (mm-display-external): Use nametemplate (defined in
RFC1524) if it is in mailcap or add a suffix according to
mailcap-mime-extensions when generating a temp filename; postpone
deleting a temp file for 2 seconds for some wrappers, shell
scripts, and so on, which might exit right after having started a
viewer command as a background job.
2005-12-06 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-art.el (gnus-default-article-saver): Add user-defined
`function' to custom type.
2005-12-02 ARISAWA Akihiro <ari@mbf.ocn.ne.jp> (tiny change)
* lisp/gnus/mm-view.el (mm-inline-text-html-render-with-w3m): Fix misplaced
parens.
2005-11-29 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-cache.el (gnus-cache-rename-group): Wrap doc strings and
long lines.
(gnus-cache-delete-group): Wrap doc strings.
* lisp/gnus/gnus-agent.el (gnus-agent-rename-group)
(gnus-agent-delete-group): Wrap doc strings.
2005-11-24 Pascal Rigaux <pixel@mandriva.com> (tiny change)
* lisp/gnus/rfc2231.el (rfc2231-parse-string): Support non-ascii chars.
2005-11-22 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nnmail.el (nnmail-fancy-expiry-target): Use current-time instead
of current-time-string.
2005-11-20 Stefan Schimanski <schimmi@debian.org> (tiny change)
* lisp/gnus/nnmail.el (nnmail-fancy-expiry-target): Protect against invalid
date header.
2005-11-16 Boris Samorodov <bsam@ipt.ru> (tiny patch)
* lisp/gnus/imap.el (imap-kerberos4-open): Ignore SSL stuff.
2005-11-14 Kevin Greiner <kevin.greiner@compsol.cc>
* lisp/gnus/gnus-agent.el (gnus-agent-article-alist-save-format): Changed
internal variable to a custom variable. Changed default value
from compressed(2) to uncompressed(1).
(gnus-agent-read-agentview): Reversed revision 7.8 to restore
support for uncompressed agentview files. Taken together, reading
the agentview file should now be 6-7 times faster.
(gnus-agent-long-article,
gnus-agent-short-article, gnus-agent-score): Renamed category
keywords to match gnus-cus.
(gnus-agent-summary-fetch-series): Modified to protect against
gnus-agent-summary-fetch-group clearing processable flags.
(gnus-agent-synchronize-group-flags): Update live group buffer as
synchronization may occur due to the user toggling the plugged
status.
(gnus-agent-braid-nov): Now tests new nov entries
for duplicates which are removed. The invalid sort check then
triggers a rescan after the sort as sorting may have moved
duplicate entries such that they can be cheaply detected.
(gnus-agent-read-local): Trivial fix to format of
error message to display actual error condition.
(gnus-agent-save-local): Avoid saving symbols that are bound to
nil as they simply result in a warning message in
gnus-agent-read-local.
(gnus-agent-fetch-group-1): Clear downloadable flag when article
successfully downloaded.
(gnus-agent-regenerate-group): Use
gnus-agent-synchronize-group-flags to reset read status in both
gnus and server.
* lisp/gnus/nntp.el (nntp-end-of-line): Doc fix.
(nntp-authinfo-rejected): New error condition.
(nntp-wait-for): Use new error condition to signal authentication
error.
(nntp-retrieve-data): Rethrow new error condition to break out of
recursive call to nntp-send-authinfo.
2005-11-13 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Use make-local-variable
rather than make-variable-buffer-local for file-precious-flag.
2005-11-13 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Quote file-precious-flag.
2005-11-11 Jan Nieuwenhuizen <janneke@gnu.org>
* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Set file-precious-flag,
as a buffer-local variable. This avoids creating truncated
dribble files as a result of a hang up, eg.
2005-11-04 Ken Manheimer <ken.manheimer@gmail.com>
* lisp/gnus/pgg-pgp.el (pgg-pgp-encrypt-region, pgg-pgp-decrypt-region)
(pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
(pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt)
(pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
(pgg-pgp-decrypt-region, pgg-pgp-sign-region): Use new name for
pgg-add-passphrase-to-cache function.
* lisp/gnus/pgg-pgp5.el (pgg-pgp5-encrypt-region, pgg-pgp5-decrypt-region)
(pgg-pgp5-encrypt-symmetric-region, pgg-pgp5-encrypt-symmetric)
(pgg-pgp5-encrypt, pgg-pgp5-decrypt-region, pgg-pgp5-decrypt)
(pgg-pgp5-sign-region, pgg-pgp5-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
(pgg-pgp5-sign-region): Use new name of pgg-add-passphrase-to-cache
function.
2005-10-30 Chong Yidong <cyd@stupidchicken.com>
* lisp/gnus/imap.el (imap-open): Handle case where buffer is a buffer
object.
2005-10-29 Ken Manheimer <ken.manheimer@gmail.com>
* lisp/gnus/pgg-gpg.el (pgg-gpg-select-matching-key): Fix: look at the right
part of the decoded armor to find the key-identifier.
(pgg-gpg-lookup-key-owner): New function to return the
human-readable identifier of a key owner.
(pgg-gpg-lookup-id-from-key-owner): Make it easy to identify the
key itself.
(pgg-gpg-decrypt-region): Prompt with the key owner (rather than
the key value) if we have a key and can match it against a secret
key. Also, added a note pointing out fact that the prompt only
indicates the first matching key.
* lisp/gnus/pgg.el (pgg-decrypt): Passing along 'passphrase' in call to
pgg-decrypt-region.
(pgg-pending-timers): A new hash for tracking the passphrase cache
timers, so that new ones supercede old ones.
(pgg-add-passphrase-to-cache): Rename from
`pgg-add-passphrase-cache' to reduce confusion (all callers
changed). Modified to cancel old timers when new ones are added.
(pgg-remove-passphrase-from-cache): Rename from
`pgg-remove-passphrase-cache' to reduce confusion (all callers
changed). Modified to cancel old timers when their keys are
removed from the cache.
(pgg-cancel-timer): In Emacs, an alias for cancel-timer; in
XEmacs, an indirection to delete-itimer.
(pgg-read-passphrase-from-cache, pgg-read-passphrase):
Extract pgg-read-passphrase-from-cache from pgg-read-passphrase so
users can only check cache without risk of prompting. Correct bug in
notruncate behavior.
(pgg-read-passphrase-from-cache, pgg-read-passphrase)
(pgg-add-passphrase-cache, pgg-remove-passphrase-cache):
Add informative docstrings.
(pgg-decrypt): Convey provided passphrase in subordinate call to
pgg-decrypt-region.
2005-10-20 Ken Manheimer <ken.manheimer+emacs@gmail.com>
* lisp/gnus/pgg.el (pgg-encrypt-region, pgg-encrypt-symmetric-region)
(pgg-encrypt-symmetric, pgg-encrypt, pgg-decrypt-region)
(pgg-decrypt, pgg-sign-region, pgg-sign): Add optional
'passphrase' argument, so the passphrase can be managed externally
and then passed in to the system.
* lisp/gnus/pgg.el (pgg-read-passphrase, pgg-add-passphrase-cache)
(pgg-remove-passphrase-cache): Add optional 'notruncate' argument,
so the passphrase cache can be used reliably with identifiers
besides a pgp packet's key id.
* lisp/gnus/pgg-gpg.el (pgg-pgp-encrypt-region)
(pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
(pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt)
(pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase'
argument to all these routines, so the passphrase can be managed
externally and passed in to the system.
* lisp/gnus/pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Add optional
'notruncate' argument, so the passphrase cache can be used
reliably with identifiers besides a pgp packet's key id.
2005-10-29 Sascha Wilde <swilde@sha-bang.de>
* lisp/gnus/pgg-gpg.el (pgg-gpg-encrypt-symmetric-region): New function for
symmetric encryption.
(pgg-gpg-symmetric-key-p): New function to check for an symmetric
encrypted session key.
(pgg-gpg-decrypt-region): When decrypting a symmetric encrypted
message ask for the passphrase in a proper way.
* lisp/gnus/pgg.el (pgg-encrypt-symmetric, pgg-encrypt-symmetric-region):
New user commands for symmetric encryption.
2005-12-05 Katsumi Yamaoka <yamaoka@jpl.org>
* man/pgg.texi (User Commands): Fix description of pgg-verify-region.
(Selecting an implementation): Fix descriptions.
2005-11-30 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Various Message Variables): Addition.
2005-11-29 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi: Fix default values.
2005-11-25 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Header Commands): Clarify descriptions of
message-cross-post-followup-to, message-reduce-to-to-cc, and
message-insert-wide-reply.
(Various Commands): Fix kindex for message-kill-to-signature;
clarify description of message-tab.
2005-11-22 Katsumi Yamaoka <yamaoka@jpl.org>
* man/message.texi (Mailing Lists): Fix description about MFT.
* man/gnus.texi (Emacs Lisp): Use ~/.gnus.el instead of ~/.emacs.
2005-11-17 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Slow Terminal Connection): Replace old description
with new one.
2005-11-16 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Oort Gnus): Use ~/.gnus.el instead of ~/.emacs;
replace X-Draft-Headers with X-Draft-From.
2005-11-14 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Various Various): Fix the default value of
nnheader-max-head-length.
(Gnus Versions): Fix typo.
2005-12-09 08:57:58 +00:00
|
|
|
|
(nntp-authinfo-rejected
|
|
|
|
|
(signal 'nntp-authinfo-rejected (cdr err)))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(error
|
|
|
|
|
(nnheader-report 'nntp "Couldn't open connection to %s: %s"
|
|
|
|
|
address err))
|
|
|
|
|
(quit
|
|
|
|
|
(message "Quit retrieving data from nntp")
|
|
|
|
|
(signal 'quit nil)
|
|
|
|
|
nil)))
|
|
|
|
|
(nnheader-report 'nntp "Couldn't open connection to %s" address))))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(defsubst nntp-send-command (wait-for &rest strings)
|
|
|
|
|
"Send STRINGS to server and wait until WAIT-FOR returns."
|
|
|
|
|
(when (and (not nnheader-callback-function)
|
|
|
|
|
(not nntp-inhibit-output))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer nntp-server-buffer)
|
|
|
|
|
(erase-buffer)))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(let* ((command (mapconcat 'identity strings " "))
|
|
|
|
|
(process (nntp-find-connection nntp-server-buffer))
|
|
|
|
|
(buffer (and process (process-buffer process)))
|
|
|
|
|
(pos (and buffer (with-current-buffer buffer (point)))))
|
|
|
|
|
(if process
|
|
|
|
|
(prog1
|
|
|
|
|
(nntp-retrieve-data command
|
|
|
|
|
nntp-address nntp-port-number
|
|
|
|
|
nntp-server-buffer
|
|
|
|
|
wait-for nnheader-callback-function)
|
|
|
|
|
;; If nothing to wait for, still remove possibly echo'ed commands.
|
|
|
|
|
;; We don't have echos if nntp-open-connection-function
|
|
|
|
|
;; is `nntp-open-network-stream', so we skip this in that case.
|
|
|
|
|
(unless (or wait-for
|
|
|
|
|
(equal nntp-open-connection-function
|
|
|
|
|
'nntp-open-network-stream))
|
|
|
|
|
(nntp-accept-response)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer buffer)
|
|
|
|
|
(goto-char pos)
|
|
|
|
|
(if (looking-at (regexp-quote command))
|
|
|
|
|
(delete-region pos (progn (forward-line 1)
|
|
|
|
|
(gnus-point-at-bol))))
|
|
|
|
|
)))
|
|
|
|
|
(nnheader-report 'nntp "Couldn't open connection to %s."
|
|
|
|
|
nntp-address))))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(defun nntp-send-command-nodelete (wait-for &rest strings)
|
|
|
|
|
"Send STRINGS to server and wait until WAIT-FOR returns."
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(let* ((command (mapconcat 'identity strings " "))
|
|
|
|
|
(process (nntp-find-connection nntp-server-buffer))
|
|
|
|
|
(buffer (and process (process-buffer process)))
|
|
|
|
|
(pos (and buffer (with-current-buffer buffer (point)))))
|
|
|
|
|
(if process
|
|
|
|
|
(prog1
|
|
|
|
|
(nntp-retrieve-data command
|
|
|
|
|
nntp-address nntp-port-number
|
|
|
|
|
nntp-server-buffer
|
|
|
|
|
wait-for nnheader-callback-function)
|
|
|
|
|
;; If nothing to wait for, still remove possibly echo'ed commands
|
|
|
|
|
(unless wait-for
|
|
|
|
|
(nntp-accept-response)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer buffer)
|
|
|
|
|
(goto-char pos)
|
|
|
|
|
(if (looking-at (regexp-quote command))
|
|
|
|
|
(delete-region pos (progn (forward-line 1)
|
|
|
|
|
(gnus-point-at-bol)))))))
|
|
|
|
|
(nnheader-report 'nntp "Couldn't open connection to %s."
|
|
|
|
|
nntp-address))))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(defun nntp-send-command-and-decode (wait-for &rest strings)
|
|
|
|
|
"Send STRINGS to server and wait until WAIT-FOR returns."
|
|
|
|
|
(when (and (not nnheader-callback-function)
|
|
|
|
|
(not nntp-inhibit-output))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer nntp-server-buffer)
|
|
|
|
|
(erase-buffer)))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(let* ((command (mapconcat 'identity strings " "))
|
|
|
|
|
(process (nntp-find-connection nntp-server-buffer))
|
|
|
|
|
(buffer (and process (process-buffer process)))
|
|
|
|
|
(pos (and buffer (with-current-buffer buffer (point)))))
|
|
|
|
|
(if process
|
|
|
|
|
(prog1
|
|
|
|
|
(nntp-retrieve-data command
|
|
|
|
|
nntp-address nntp-port-number
|
|
|
|
|
nntp-server-buffer
|
|
|
|
|
wait-for nnheader-callback-function t)
|
|
|
|
|
;; If nothing to wait for, still remove possibly echo'ed commands
|
|
|
|
|
(unless wait-for
|
|
|
|
|
(nntp-accept-response)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer buffer)
|
|
|
|
|
(goto-char pos)
|
|
|
|
|
(if (looking-at (regexp-quote command))
|
|
|
|
|
(delete-region pos (progn (forward-line 1) (gnus-point-at-bol))))
|
|
|
|
|
)))
|
|
|
|
|
(nnheader-report 'nntp "Couldn't open connection to %s."
|
|
|
|
|
nntp-address))))
|
|
|
|
|
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(defun nntp-send-buffer (wait-for)
|
|
|
|
|
"Send the current buffer to server and wait until WAIT-FOR returns."
|
|
|
|
|
(when (and (not nnheader-callback-function)
|
|
|
|
|
(not nntp-inhibit-output))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer (nntp-find-connection-buffer nntp-server-buffer))
|
|
|
|
|
(erase-buffer)))
|
|
|
|
|
(nntp-encode-text)
|
2002-01-03 14:51:05 +00:00
|
|
|
|
(mm-with-unibyte-current-buffer
|
|
|
|
|
;; Some encoded unicode text contains character 0x80-0x9f e.g. Euro.
|
|
|
|
|
(process-send-region (nntp-find-connection nntp-server-buffer)
|
|
|
|
|
(point-min) (point-max)))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(nntp-retrieve-data
|
|
|
|
|
nil nntp-address nntp-port-number nntp-server-buffer
|
|
|
|
|
wait-for nnheader-callback-function))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Interface functions.
|
|
|
|
|
|
|
|
|
|
(nnoo-define-basics nntp)
|
|
|
|
|
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(defsubst nntp-next-result-arrived-p ()
|
|
|
|
|
(cond
|
|
|
|
|
;; A result that starts with a 2xx code is terminated by
|
|
|
|
|
;; a line with only a "." on it.
|
2000-09-19 13:37:09 +00:00
|
|
|
|
((eq (char-after) ?2)
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(if (re-search-forward "\n\\.\r?\n" nil t)
|
|
|
|
|
t
|
|
|
|
|
nil))
|
|
|
|
|
;; A result that starts with a 3xx or 4xx code is terminated
|
|
|
|
|
;; by a newline.
|
|
|
|
|
((looking-at "[34]")
|
|
|
|
|
(if (search-forward "\n" nil t)
|
|
|
|
|
t
|
|
|
|
|
nil))
|
|
|
|
|
;; No result here.
|
|
|
|
|
(t
|
|
|
|
|
nil)))
|
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(eval-when-compile
|
|
|
|
|
(defvar nntp-with-open-group-internal nil)
|
|
|
|
|
(defvar nntp-report-n nil))
|
|
|
|
|
|
|
|
|
|
(defmacro nntp-with-open-group (group server &optional connectionless &rest forms)
|
|
|
|
|
"Protect against servers that don't like clients that keep idle connections opens.
|
|
|
|
|
The problem being that these servers may either close a connection or
|
|
|
|
|
simply ignore any further requests on a connection. Closed
|
|
|
|
|
connections are not detected until accept-process-output has updated
|
|
|
|
|
the process-status. Dropped connections are not detected until the
|
|
|
|
|
connection timeouts (which may be several minutes) or
|
|
|
|
|
nntp-connection-timeout has expired. When these occur
|
|
|
|
|
nntp-with-open-group, opens a new connection then re-issues the NNTP
|
|
|
|
|
command whose response triggered the error."
|
|
|
|
|
(when (and (listp connectionless)
|
|
|
|
|
(not (eq connectionless nil)))
|
|
|
|
|
(setq forms (cons connectionless forms)
|
|
|
|
|
connectionless nil))
|
|
|
|
|
`(letf ((nntp-report-n (symbol-function 'nntp-report))
|
|
|
|
|
((symbol-function 'nntp-report) (symbol-function 'nntp-report-1))
|
|
|
|
|
(nntp-with-open-group-internal nil))
|
|
|
|
|
(while (catch 'nntp-with-open-group-error
|
|
|
|
|
;; Open the connection to the server
|
|
|
|
|
;; NOTE: Existing connections are NOT tested.
|
|
|
|
|
(nntp-possibly-change-group ,group ,server ,connectionless)
|
|
|
|
|
|
|
|
|
|
(let ((timer
|
|
|
|
|
(and nntp-connection-timeout
|
|
|
|
|
(nnheader-run-at-time
|
|
|
|
|
nntp-connection-timeout nil
|
|
|
|
|
'(lambda ()
|
|
|
|
|
(let ((process (nntp-find-connection
|
|
|
|
|
nntp-server-buffer))
|
|
|
|
|
(buffer (and process
|
|
|
|
|
(process-buffer process))))
|
|
|
|
|
;; When I an able to identify the
|
|
|
|
|
;; connection to the server AND I've
|
|
|
|
|
;; received NO reponse for
|
|
|
|
|
;; nntp-connection-timeout seconds.
|
|
|
|
|
(when (and buffer (eq 0 (buffer-size buffer)))
|
|
|
|
|
;; Close the connection. Take no
|
|
|
|
|
;; other action as the accept input
|
|
|
|
|
;; code will handle the closed
|
|
|
|
|
;; connection.
|
|
|
|
|
(nntp-kill-buffer buffer))))))))
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(setq nntp-with-open-group-internal
|
|
|
|
|
(condition-case nil
|
|
|
|
|
(progn ,@forms)
|
|
|
|
|
(quit
|
|
|
|
|
(nntp-close-server)
|
|
|
|
|
(signal 'quit nil))))
|
|
|
|
|
(when timer
|
|
|
|
|
(nnheader-cancel-timer timer)))
|
|
|
|
|
nil))
|
|
|
|
|
(setf (symbol-function 'nntp-report) nntp-report-n))
|
|
|
|
|
nntp-with-open-group-internal))
|
|
|
|
|
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(deffoo nntp-retrieve-headers (articles &optional group server fetch-old)
|
|
|
|
|
"Retrieve the headers of ARTICLES."
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(nntp-with-open-group
|
|
|
|
|
group server
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer (nntp-find-connection-buffer nntp-server-buffer))
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(if (and (not gnus-nov-is-evil)
|
|
|
|
|
(not nntp-nov-is-evil)
|
|
|
|
|
(nntp-retrieve-headers-with-xover articles fetch-old))
|
|
|
|
|
;; We successfully retrieved the headers via XOVER.
|
|
|
|
|
'nov
|
|
|
|
|
;; XOVER didn't work, so we do it the hard, slow and inefficient
|
|
|
|
|
;; way.
|
|
|
|
|
(let ((number (length articles))
|
|
|
|
|
(articles articles)
|
|
|
|
|
(count 0)
|
|
|
|
|
(received 0)
|
|
|
|
|
(last-point (point-min))
|
|
|
|
|
(buf (nntp-find-connection-buffer nntp-server-buffer))
|
|
|
|
|
(nntp-inhibit-erase t)
|
|
|
|
|
article)
|
|
|
|
|
;; Send HEAD commands.
|
|
|
|
|
(while (setq article (pop articles))
|
|
|
|
|
(nntp-send-command
|
|
|
|
|
nil
|
|
|
|
|
"HEAD" (if (numberp article)
|
|
|
|
|
(int-to-string article)
|
|
|
|
|
;; `articles' is either a list of article numbers
|
|
|
|
|
;; or a list of article IDs.
|
|
|
|
|
article))
|
|
|
|
|
(incf count)
|
|
|
|
|
;; Every 400 requests we have to read the stream in
|
|
|
|
|
;; order to avoid deadlocks.
|
|
|
|
|
(when (or (null articles) ;All requests have been sent.
|
|
|
|
|
(zerop (% count nntp-maximum-request)))
|
|
|
|
|
(nntp-accept-response)
|
|
|
|
|
(while (progn
|
|
|
|
|
(set-buffer buf)
|
|
|
|
|
(goto-char last-point)
|
|
|
|
|
;; Count replies.
|
|
|
|
|
(while (nntp-next-result-arrived-p)
|
|
|
|
|
(setq last-point (point))
|
|
|
|
|
(incf received))
|
|
|
|
|
(< received count))
|
|
|
|
|
;; If number of headers is greater than 100, give
|
|
|
|
|
;; informative messages.
|
|
|
|
|
(and (numberp nntp-large-newsgroup)
|
|
|
|
|
(> number nntp-large-newsgroup)
|
|
|
|
|
(zerop (% received 20))
|
|
|
|
|
(nnheader-message 6 "NNTP: Receiving headers... %d%%"
|
|
|
|
|
(/ (* received 100) number)))
|
|
|
|
|
(nntp-accept-response))))
|
|
|
|
|
(and (numberp nntp-large-newsgroup)
|
|
|
|
|
(> number nntp-large-newsgroup)
|
|
|
|
|
(nnheader-message 6 "NNTP: Receiving headers...done"))
|
|
|
|
|
|
|
|
|
|
;; Now all of replies are received. Fold continuation lines.
|
|
|
|
|
(nnheader-fold-continuation-lines)
|
|
|
|
|
;; Remove all "\r"'s.
|
|
|
|
|
(nnheader-strip-cr)
|
|
|
|
|
(copy-to-buffer nntp-server-buffer (point-min) (point-max))
|
|
|
|
|
'headers)))))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(deffoo nntp-retrieve-groups (groups &optional server)
|
|
|
|
|
"Retrieve group info on GROUPS."
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(nntp-with-open-group
|
|
|
|
|
nil server
|
|
|
|
|
(when (nntp-find-connection-buffer nntp-server-buffer)
|
|
|
|
|
(catch 'done
|
|
|
|
|
(save-excursion
|
|
|
|
|
;; Erase nntp-server-buffer before nntp-inhibit-erase.
|
|
|
|
|
(set-buffer nntp-server-buffer)
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(set-buffer (nntp-find-connection-buffer nntp-server-buffer))
|
|
|
|
|
;; The first time this is run, this variable is `try'. So we
|
|
|
|
|
;; try.
|
|
|
|
|
(when (eq nntp-server-list-active-group 'try)
|
|
|
|
|
(nntp-try-list-active (car groups)))
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(let ((count 0)
|
|
|
|
|
(groups groups)
|
|
|
|
|
(received 0)
|
|
|
|
|
(last-point (point-min))
|
|
|
|
|
(nntp-inhibit-erase t)
|
|
|
|
|
(buf (nntp-find-connection-buffer nntp-server-buffer))
|
|
|
|
|
(command (if nntp-server-list-active-group
|
|
|
|
|
"LIST ACTIVE" "GROUP")))
|
|
|
|
|
(while groups
|
|
|
|
|
;; Timeout may have killed the buffer.
|
|
|
|
|
(unless (gnus-buffer-live-p buf)
|
|
|
|
|
(nnheader-report 'nntp "Connection to %s is closed." server)
|
|
|
|
|
(throw 'done nil))
|
|
|
|
|
;; Send the command to the server.
|
|
|
|
|
(nntp-send-command nil command (pop groups))
|
|
|
|
|
(incf count)
|
|
|
|
|
;; Every 400 requests we have to read the stream in
|
|
|
|
|
;; order to avoid deadlocks.
|
|
|
|
|
(when (or (null groups) ;All requests have been sent.
|
|
|
|
|
(zerop (% count nntp-maximum-request)))
|
|
|
|
|
(nntp-accept-response)
|
|
|
|
|
(while (and (gnus-buffer-live-p buf)
|
|
|
|
|
(progn
|
|
|
|
|
;; Search `blue moon' in this file for the
|
|
|
|
|
;; reason why set-buffer here.
|
|
|
|
|
(set-buffer buf)
|
|
|
|
|
(goto-char last-point)
|
|
|
|
|
;; Count replies.
|
|
|
|
|
(while (re-search-forward "^[0-9]" nil t)
|
|
|
|
|
(incf received))
|
|
|
|
|
(setq last-point (point))
|
|
|
|
|
(< received count)))
|
|
|
|
|
(nntp-accept-response))))
|
|
|
|
|
|
|
|
|
|
;; Wait for the reply from the final command.
|
|
|
|
|
(unless (gnus-buffer-live-p buf)
|
|
|
|
|
(nnheader-report 'nntp "Connection to %s is closed." server)
|
|
|
|
|
(throw 'done nil))
|
|
|
|
|
(set-buffer buf)
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(re-search-backward "^[0-9]" nil t)
|
|
|
|
|
(when (looking-at "^[23]")
|
|
|
|
|
(while (and (gnus-buffer-live-p buf)
|
|
|
|
|
(progn
|
|
|
|
|
(set-buffer buf)
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(if (not nntp-server-list-active-group)
|
|
|
|
|
(not (re-search-backward "\r?\n"
|
|
|
|
|
(- (point) 3) t))
|
|
|
|
|
(not (re-search-backward "^\\.\r?\n"
|
|
|
|
|
(- (point) 4) t)))))
|
|
|
|
|
(nntp-accept-response)))
|
|
|
|
|
|
|
|
|
|
;; Now all replies are received. We remove CRs.
|
|
|
|
|
(unless (gnus-buffer-live-p buf)
|
|
|
|
|
(nnheader-report 'nntp "Connection to %s is closed." server)
|
|
|
|
|
(throw 'done nil))
|
|
|
|
|
(set-buffer buf)
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(while (search-forward "\r" nil t)
|
|
|
|
|
(replace-match "" t t))
|
|
|
|
|
|
|
|
|
|
(if (not nntp-server-list-active-group)
|
|
|
|
|
(progn
|
|
|
|
|
(copy-to-buffer nntp-server-buffer (point-min) (point-max))
|
|
|
|
|
'group)
|
|
|
|
|
;; We have read active entries, so we just delete the
|
|
|
|
|
;; superfluous gunk.
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(while (re-search-forward "^[.2-5]" nil t)
|
|
|
|
|
(delete-region (match-beginning 0)
|
|
|
|
|
(progn (forward-line 1) (point))))
|
|
|
|
|
(copy-to-buffer nntp-server-buffer (point-min) (point-max))
|
|
|
|
|
'active)))))))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(deffoo nntp-retrieve-articles (articles &optional group server)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(nntp-with-open-group
|
|
|
|
|
group server
|
|
|
|
|
(save-excursion
|
|
|
|
|
(let ((number (length articles))
|
|
|
|
|
(articles articles)
|
|
|
|
|
(count 0)
|
|
|
|
|
(received 0)
|
|
|
|
|
(last-point (point-min))
|
|
|
|
|
(buf (nntp-find-connection-buffer nntp-server-buffer))
|
|
|
|
|
(nntp-inhibit-erase t)
|
|
|
|
|
(map (apply 'vector articles))
|
|
|
|
|
(point 1)
|
|
|
|
|
article)
|
|
|
|
|
(set-buffer buf)
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
;; Send ARTICLE command.
|
|
|
|
|
(while (setq article (pop articles))
|
|
|
|
|
(nntp-send-command
|
|
|
|
|
nil
|
|
|
|
|
"ARTICLE" (if (numberp article)
|
|
|
|
|
(int-to-string article)
|
|
|
|
|
;; `articles' is either a list of article numbers
|
|
|
|
|
;; or a list of article IDs.
|
|
|
|
|
article))
|
|
|
|
|
(incf count)
|
|
|
|
|
;; Every 400 requests we have to read the stream in
|
|
|
|
|
;; order to avoid deadlocks.
|
|
|
|
|
(when (or (null articles) ;All requests have been sent.
|
|
|
|
|
(zerop (% count nntp-maximum-request)))
|
|
|
|
|
(nntp-accept-response)
|
|
|
|
|
(while (progn
|
|
|
|
|
(set-buffer buf)
|
|
|
|
|
(goto-char last-point)
|
|
|
|
|
;; Count replies.
|
|
|
|
|
(while (nntp-next-result-arrived-p)
|
|
|
|
|
(aset map received (cons (aref map received) (point)))
|
|
|
|
|
(setq last-point (point))
|
|
|
|
|
(incf received))
|
|
|
|
|
(< received count))
|
|
|
|
|
;; If number of headers is greater than 100, give
|
|
|
|
|
;; informative messages.
|
|
|
|
|
(and (numberp nntp-large-newsgroup)
|
|
|
|
|
(> number nntp-large-newsgroup)
|
|
|
|
|
(zerop (% received 20))
|
|
|
|
|
(nnheader-message 6 "NNTP: Receiving articles... %d%%"
|
|
|
|
|
(/ (* received 100) number)))
|
|
|
|
|
(nntp-accept-response))))
|
|
|
|
|
(and (numberp nntp-large-newsgroup)
|
|
|
|
|
(> number nntp-large-newsgroup)
|
|
|
|
|
(nnheader-message 6 "NNTP: Receiving articles...done"))
|
|
|
|
|
|
|
|
|
|
;; Now we have all the responses. We go through the results,
|
|
|
|
|
;; wash it and copy it over to the server buffer.
|
|
|
|
|
(set-buffer nntp-server-buffer)
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(setq last-point (point-min))
|
|
|
|
|
(mapcar
|
|
|
|
|
(lambda (entry)
|
|
|
|
|
(narrow-to-region
|
|
|
|
|
(setq point (goto-char (point-max)))
|
|
|
|
|
(progn
|
|
|
|
|
(insert-buffer-substring buf last-point (cdr entry))
|
|
|
|
|
(point-max)))
|
|
|
|
|
(setq last-point (cdr entry))
|
|
|
|
|
(nntp-decode-text)
|
|
|
|
|
(widen)
|
|
|
|
|
(cons (car entry) point))
|
|
|
|
|
map)))))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(defun nntp-try-list-active (group)
|
|
|
|
|
(nntp-list-active-group group)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer nntp-server-buffer)
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(cond ((or (eobp)
|
|
|
|
|
(looking-at "5[0-9]+"))
|
|
|
|
|
(setq nntp-server-list-active-group nil))
|
|
|
|
|
(t
|
|
|
|
|
(setq nntp-server-list-active-group t)))))
|
|
|
|
|
|
|
|
|
|
(deffoo nntp-list-active-group (group &optional server)
|
2000-09-19 13:37:09 +00:00
|
|
|
|
"Return the active info on GROUP (which can be a regexp)."
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(nntp-with-open-group
|
|
|
|
|
nil server
|
|
|
|
|
(nntp-send-command "^\\.*\r?\n" "LIST ACTIVE" group)))
|
2000-09-19 13:37:09 +00:00
|
|
|
|
|
|
|
|
|
(deffoo nntp-request-group-articles (group &optional server)
|
|
|
|
|
"Return the list of existing articles in GROUP."
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(nntp-with-open-group
|
|
|
|
|
nil server
|
|
|
|
|
(nntp-send-command "^\\.*\r?\n" "LISTGROUP" group)))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(deffoo nntp-request-article (article &optional group server buffer command)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(nntp-with-open-group
|
|
|
|
|
group server
|
|
|
|
|
(when (nntp-send-command-and-decode
|
|
|
|
|
"\r?\n\\.\r?\n" "ARTICLE"
|
|
|
|
|
(if (numberp article) (int-to-string article) article))
|
|
|
|
|
(if (and buffer
|
|
|
|
|
(not (equal buffer nntp-server-buffer)))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer nntp-server-buffer)
|
|
|
|
|
(copy-to-buffer buffer (point-min) (point-max))
|
|
|
|
|
(nntp-find-group-and-number group))
|
|
|
|
|
(nntp-find-group-and-number group)))))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(deffoo nntp-request-head (article &optional group server)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(nntp-with-open-group
|
|
|
|
|
group server
|
|
|
|
|
(when (nntp-send-command
|
|
|
|
|
"\r?\n\\.\r?\n" "HEAD"
|
|
|
|
|
(if (numberp article) (int-to-string article) article))
|
|
|
|
|
(prog1
|
|
|
|
|
(nntp-find-group-and-number group)
|
|
|
|
|
(nntp-decode-text)))))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(deffoo nntp-request-body (article &optional group server)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(nntp-with-open-group
|
|
|
|
|
group server
|
|
|
|
|
(nntp-send-command-and-decode
|
|
|
|
|
"\r?\n\\.\r?\n" "BODY"
|
|
|
|
|
(if (numberp article) (int-to-string article) article))))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(deffoo nntp-request-group (group &optional server dont-check)
|
2005-08-06 19:51:42 +00:00
|
|
|
|
(nntp-with-open-group
|
2004-09-04 13:13:48 +00:00
|
|
|
|
nil server
|
|
|
|
|
(when (nntp-send-command "^[245].*\n" "GROUP" group)
|
|
|
|
|
(let ((entry (nntp-find-connection-entry nntp-server-buffer)))
|
|
|
|
|
(setcar (cddr entry) group)))))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(deffoo nntp-close-group (group &optional server)
|
|
|
|
|
t)
|
|
|
|
|
|
|
|
|
|
(deffoo nntp-server-opened (&optional server)
|
|
|
|
|
"Say whether a connection to SERVER has been opened."
|
|
|
|
|
(and (nnoo-current-server-p 'nntp server)
|
|
|
|
|
nntp-server-buffer
|
|
|
|
|
(gnus-buffer-live-p nntp-server-buffer)
|
|
|
|
|
(nntp-find-connection nntp-server-buffer)))
|
|
|
|
|
|
|
|
|
|
(deffoo nntp-open-server (server &optional defs connectionless)
|
|
|
|
|
(nnheader-init-server-buffer)
|
|
|
|
|
(if (nntp-server-opened server)
|
|
|
|
|
t
|
|
|
|
|
(when (or (stringp (car defs))
|
|
|
|
|
(numberp (car defs)))
|
|
|
|
|
(setq defs (cons (list 'nntp-port-number (car defs)) (cdr defs))))
|
|
|
|
|
(unless (assq 'nntp-address defs)
|
|
|
|
|
(setq defs (append defs (list (list 'nntp-address server)))))
|
|
|
|
|
(nnoo-change-server 'nntp server defs)
|
|
|
|
|
(unless connectionless
|
|
|
|
|
(or (nntp-find-connection nntp-server-buffer)
|
|
|
|
|
(nntp-open-connection nntp-server-buffer)))))
|
|
|
|
|
|
|
|
|
|
(deffoo nntp-close-server (&optional server)
|
|
|
|
|
(nntp-possibly-change-group nil server t)
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(let ((process (nntp-find-connection nntp-server-buffer)))
|
|
|
|
|
(while process
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(when (memq (process-status process) '(open run))
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(ignore-errors
|
|
|
|
|
(nntp-send-string process "QUIT")
|
|
|
|
|
(unless (eq nntp-open-connection-function 'nntp-open-network-stream)
|
|
|
|
|
;; Ok, this is evil, but when using telnet and stuff
|
|
|
|
|
;; as the connection method, it's important that the
|
|
|
|
|
;; QUIT command actually is sent out before we kill
|
|
|
|
|
;; the process.
|
|
|
|
|
(sleep-for 1))))
|
2000-09-19 13:37:09 +00:00
|
|
|
|
(nntp-kill-buffer (process-buffer process))
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(setq process (car (pop nntp-connection-alist))))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(nnoo-close-server 'nntp)))
|
|
|
|
|
|
|
|
|
|
(deffoo nntp-request-close ()
|
|
|
|
|
(let (process)
|
|
|
|
|
(while (setq process (pop nntp-connection-list))
|
|
|
|
|
(when (memq (process-status process) '(open run))
|
|
|
|
|
(ignore-errors
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(nntp-send-string process "QUIT")
|
|
|
|
|
(unless (eq nntp-open-connection-function 'nntp-open-network-stream)
|
|
|
|
|
;; Ok, this is evil, but when using telnet and stuff
|
|
|
|
|
;; as the connection method, it's important that the
|
|
|
|
|
;; QUIT command actually is sent out before we kill
|
|
|
|
|
;; the process.
|
|
|
|
|
(sleep-for 1))))
|
2000-09-19 13:37:09 +00:00
|
|
|
|
(nntp-kill-buffer (process-buffer process)))))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(deffoo nntp-request-list (&optional server)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(nntp-with-open-group
|
|
|
|
|
nil server
|
|
|
|
|
(nntp-send-command-and-decode "\r?\n\\.\r?\n" "LIST")))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(deffoo nntp-request-list-newsgroups (&optional server)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(nntp-with-open-group
|
|
|
|
|
nil server
|
|
|
|
|
(nntp-send-command "\r?\n\\.\r?\n" "LIST NEWSGROUPS")))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(deffoo nntp-request-newgroups (date &optional server)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(nntp-with-open-group
|
|
|
|
|
nil server
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer nntp-server-buffer)
|
|
|
|
|
(let* ((time (date-to-time date))
|
|
|
|
|
(ls (- (cadr time) (nth 8 (decode-time time)))))
|
|
|
|
|
(cond ((< ls 0)
|
|
|
|
|
(setcar time (1- (car time)))
|
|
|
|
|
(setcar (cdr time) (+ ls 65536)))
|
|
|
|
|
((>= ls 65536)
|
|
|
|
|
(setcar time (1+ (car time)))
|
|
|
|
|
(setcar (cdr time) (- ls 65536)))
|
|
|
|
|
(t
|
|
|
|
|
(setcar (cdr time) ls)))
|
|
|
|
|
(prog1
|
|
|
|
|
(nntp-send-command
|
|
|
|
|
"^\\.\r?\n" "NEWGROUPS"
|
|
|
|
|
(format-time-string "%y%m%d %H%M%S" time)
|
|
|
|
|
"GMT")
|
|
|
|
|
(nntp-decode-text))))))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(deffoo nntp-request-post (&optional server)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(nntp-with-open-group
|
|
|
|
|
nil server
|
|
|
|
|
(when (nntp-send-command "^[23].*\r?\n" "POST")
|
|
|
|
|
(let ((response (with-current-buffer nntp-server-buffer
|
|
|
|
|
nntp-process-response))
|
|
|
|
|
server-id)
|
|
|
|
|
(when (and response
|
|
|
|
|
(string-match "^[23].*\\(<[^\t\n @<>]+@[^\t\n @<>]+>\\)"
|
|
|
|
|
response))
|
|
|
|
|
(setq server-id (match-string 1 response))
|
|
|
|
|
(narrow-to-region (goto-char (point-min))
|
|
|
|
|
(if (search-forward "\n\n" nil t)
|
|
|
|
|
(1- (point))
|
|
|
|
|
(point-max)))
|
|
|
|
|
(unless (mail-fetch-field "Message-ID")
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(insert "Message-ID: " server-id "\n"))
|
|
|
|
|
(widen))
|
|
|
|
|
(run-hooks 'nntp-prepare-post-hook)
|
|
|
|
|
(nntp-send-buffer "^[23].*\n")))))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(deffoo nntp-request-type (group article)
|
|
|
|
|
'news)
|
|
|
|
|
|
|
|
|
|
(deffoo nntp-asynchronous-p ()
|
|
|
|
|
t)
|
|
|
|
|
|
|
|
|
|
;;; Hooky functions.
|
|
|
|
|
|
|
|
|
|
(defun nntp-send-mode-reader ()
|
|
|
|
|
"Send the MODE READER command to the nntp server.
|
|
|
|
|
This function is supposed to be called from `nntp-server-opened-hook'.
|
|
|
|
|
It will make innd servers spawn an nnrpd process to allow actual article
|
|
|
|
|
reading."
|
2000-09-19 13:37:09 +00:00
|
|
|
|
(nntp-send-command "^.*\n" "MODE READER"))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(defun nntp-send-authinfo (&optional send-if-force)
|
1997-04-16 22:13:18 +00:00
|
|
|
|
"Send the AUTHINFO to the nntp server.
|
1999-02-20 14:05:57 +00:00
|
|
|
|
It will look in the \"~/.authinfo\" file for matching entries. If
|
|
|
|
|
nothing suitable is found there, it will prompt for a user name
|
|
|
|
|
and a password.
|
|
|
|
|
|
|
|
|
|
If SEND-IF-FORCE, only send authinfo to the server if the
|
|
|
|
|
.authinfo file has the FORCE token."
|
|
|
|
|
(let* ((list (gnus-parse-netrc nntp-authinfo-file))
|
2000-09-19 13:37:09 +00:00
|
|
|
|
(alist (gnus-netrc-machine list nntp-address "nntp"))
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(force (gnus-netrc-get alist "force"))
|
|
|
|
|
(user (or (gnus-netrc-get alist "login") nntp-authinfo-user))
|
|
|
|
|
(passwd (gnus-netrc-get alist "password")))
|
|
|
|
|
(when (or (not send-if-force)
|
|
|
|
|
force)
|
|
|
|
|
(unless user
|
|
|
|
|
(setq user (read-string (format "NNTP (%s) user name: " nntp-address))
|
|
|
|
|
nntp-authinfo-user user))
|
|
|
|
|
(unless (member user '(nil ""))
|
|
|
|
|
(nntp-send-command "^3.*\r?\n" "AUTHINFO USER" user)
|
|
|
|
|
(when t ;???Should check if AUTHINFO succeeded
|
2000-09-19 13:37:09 +00:00
|
|
|
|
(nntp-send-command
|
|
|
|
|
"^2.*\r?\n" "AUTHINFO PASS"
|
|
|
|
|
(or passwd
|
|
|
|
|
nntp-authinfo-password
|
|
|
|
|
(setq nntp-authinfo-password
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(read-passwd (format "NNTP (%s@%s) password: "
|
|
|
|
|
user nntp-address))))))))))
|
1999-02-20 14:05:57 +00:00
|
|
|
|
|
|
|
|
|
(defun nntp-send-nosy-authinfo ()
|
|
|
|
|
"Send the AUTHINFO to the nntp server."
|
|
|
|
|
(let ((user (read-string (format "NNTP (%s) user name: " nntp-address))))
|
|
|
|
|
(unless (member user '(nil ""))
|
|
|
|
|
(nntp-send-command "^3.*\r?\n" "AUTHINFO USER" user)
|
|
|
|
|
(when t ;???Should check if AUTHINFO succeeded
|
|
|
|
|
(nntp-send-command "^2.*\r?\n" "AUTHINFO PASS"
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(read-passwd (format "NNTP (%s@%s) password: "
|
|
|
|
|
user nntp-address)))))))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(defun nntp-send-authinfo-from-file ()
|
|
|
|
|
"Send the AUTHINFO to the nntp server.
|
1999-02-20 14:05:57 +00:00
|
|
|
|
|
|
|
|
|
The authinfo login name is taken from the user's login name and the
|
|
|
|
|
password contained in '~/.nntp-authinfo'."
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(when (file-exists-p "~/.nntp-authinfo")
|
2000-09-19 13:37:09 +00:00
|
|
|
|
(with-temp-buffer
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(insert-file-contents "~/.nntp-authinfo")
|
|
|
|
|
(goto-char (point-min))
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(nntp-send-command "^3.*\r?\n" "AUTHINFO USER" (user-login-name))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(nntp-send-command
|
1999-02-20 14:05:57 +00:00
|
|
|
|
"^2.*\r?\n" "AUTHINFO PASS"
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(buffer-substring (point) (gnus-point-at-eol))))))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
;;; Internal functions.
|
|
|
|
|
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(defun nntp-handle-authinfo (process)
|
|
|
|
|
"Take care of an authinfo response from the server."
|
|
|
|
|
(let ((last nntp-last-command))
|
|
|
|
|
(funcall nntp-authinfo-function)
|
|
|
|
|
;; We have to re-send the function that was interrupted by
|
|
|
|
|
;; the authinfo request.
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer nntp-server-buffer)
|
|
|
|
|
(erase-buffer))
|
|
|
|
|
(nntp-send-string process last)))
|
|
|
|
|
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(defun nntp-make-process-buffer (buffer)
|
|
|
|
|
"Create a new, fresh buffer usable for nntp process connections."
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer
|
|
|
|
|
(generate-new-buffer
|
|
|
|
|
(format " *server %s %s %s*"
|
|
|
|
|
nntp-address nntp-port-number
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(gnus-buffer-exists-p buffer))))
|
2000-09-19 13:37:09 +00:00
|
|
|
|
(mm-enable-multibyte)
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(set (make-local-variable 'after-change-functions) nil)
|
|
|
|
|
(set (make-local-variable 'nntp-process-wait-for) nil)
|
|
|
|
|
(set (make-local-variable 'nntp-process-callback) nil)
|
|
|
|
|
(set (make-local-variable 'nntp-process-to-buffer) nil)
|
|
|
|
|
(set (make-local-variable 'nntp-process-start-point) nil)
|
|
|
|
|
(set (make-local-variable 'nntp-process-decode) nil)
|
|
|
|
|
(current-buffer)))
|
|
|
|
|
|
|
|
|
|
(defun nntp-open-connection (buffer)
|
|
|
|
|
"Open a connection to PORT on ADDRESS delivering output to BUFFER."
|
|
|
|
|
(run-hooks 'nntp-prepare-server-hook)
|
|
|
|
|
(let* ((pbuffer (nntp-make-process-buffer buffer))
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(timer
|
|
|
|
|
(and nntp-connection-timeout
|
|
|
|
|
(nnheader-run-at-time
|
|
|
|
|
nntp-connection-timeout nil
|
|
|
|
|
`(lambda ()
|
2000-09-19 13:37:09 +00:00
|
|
|
|
(nntp-kill-buffer ,pbuffer)))))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(process
|
|
|
|
|
(condition-case ()
|
1997-09-26 01:50:55 +00:00
|
|
|
|
(let ((coding-system-for-read nntp-coding-system-for-read)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(coding-system-for-write nntp-coding-system-for-write))
|
1997-08-28 04:51:02 +00:00
|
|
|
|
(funcall nntp-open-connection-function pbuffer))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(error nil)
|
2000-11-17 18:23:03 +00:00
|
|
|
|
(quit
|
|
|
|
|
(message "Quit opening connection")
|
|
|
|
|
(nntp-kill-buffer pbuffer)
|
|
|
|
|
(signal 'quit nil)
|
|
|
|
|
nil))))
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(when timer
|
|
|
|
|
(nnheader-cancel-timer timer))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(unless process
|
|
|
|
|
(nntp-kill-buffer pbuffer))
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(when (and (buffer-name pbuffer)
|
|
|
|
|
process)
|
2005-06-01 05:07:06 +00:00
|
|
|
|
(gnus-set-process-query-on-exit-flag process nil)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(if (and (nntp-wait-for process "^2.*\n" buffer nil t)
|
|
|
|
|
(memq (process-status process) '(open run)))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(prog1
|
|
|
|
|
(caar (push (list process buffer nil) nntp-connection-alist))
|
|
|
|
|
(push process nntp-connection-list)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer pbuffer)
|
|
|
|
|
(nntp-read-server-type)
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(set-buffer nntp-server-buffer)
|
|
|
|
|
(let ((nnheader-callback-function nil))
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(run-hooks 'nntp-server-opened-hook)
|
|
|
|
|
(nntp-send-authinfo t))))
|
2000-09-19 13:37:09 +00:00
|
|
|
|
(nntp-kill-buffer (process-buffer process))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
nil))))
|
|
|
|
|
|
|
|
|
|
(defun nntp-open-network-stream (buffer)
|
|
|
|
|
(open-network-stream "nntpd" buffer nntp-address nntp-port-number))
|
|
|
|
|
|
2005-05-17 04:57:29 +00:00
|
|
|
|
(eval-and-compile
|
|
|
|
|
(autoload 'format-spec "format-spec")
|
|
|
|
|
(autoload 'format-spec-make "format-spec")
|
|
|
|
|
(autoload 'open-tls-stream "tls"))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(defun nntp-open-ssl-stream (buffer)
|
2003-02-28 13:36:11 +00:00
|
|
|
|
(let* ((process-connection-type nil)
|
2005-08-06 19:51:42 +00:00
|
|
|
|
(proc (start-process "nntpd" buffer
|
2003-02-28 13:36:11 +00:00
|
|
|
|
shell-file-name
|
|
|
|
|
shell-command-switch
|
2005-08-06 19:51:42 +00:00
|
|
|
|
(format-spec nntp-ssl-program
|
2003-02-28 13:36:11 +00:00
|
|
|
|
(format-spec-make
|
|
|
|
|
?s nntp-address
|
|
|
|
|
?p nntp-port-number)))))
|
2005-06-01 05:07:06 +00:00
|
|
|
|
(gnus-set-process-query-on-exit-flag proc nil)
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer buffer)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(let ((nntp-connection-alist (list proc buffer nil)))
|
|
|
|
|
(nntp-wait-for-string "^\r*20[01]"))
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(delete-region (point-min) (point))
|
|
|
|
|
proc)))
|
|
|
|
|
|
|
|
|
|
(defun nntp-open-tls-stream (buffer)
|
|
|
|
|
(let ((proc (open-tls-stream "nntpd" buffer nntp-address nntp-port-number)))
|
2005-06-01 05:07:06 +00:00
|
|
|
|
(gnus-set-process-query-on-exit-flag proc nil)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer buffer)
|
|
|
|
|
(let ((nntp-connection-alist (list proc buffer nil)))
|
|
|
|
|
(nntp-wait-for-string "^\r*20[01]"))
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(delete-region (point-min) (point))
|
|
|
|
|
proc)))
|
|
|
|
|
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(defun nntp-read-server-type ()
|
|
|
|
|
"Find out what the name of the server we have connected to is."
|
|
|
|
|
;; Wait for the status string to arrive.
|
|
|
|
|
(setq nntp-server-type (buffer-string))
|
|
|
|
|
(let ((alist nntp-server-action-alist)
|
|
|
|
|
(case-fold-search t)
|
|
|
|
|
entry)
|
|
|
|
|
;; Run server-specific commands.
|
|
|
|
|
(while alist
|
|
|
|
|
(setq entry (pop alist))
|
|
|
|
|
(when (string-match (car entry) nntp-server-type)
|
|
|
|
|
(if (and (listp (cadr entry))
|
|
|
|
|
(not (eq 'lambda (caadr entry))))
|
|
|
|
|
(eval (cadr entry))
|
|
|
|
|
(funcall (cadr entry)))))))
|
|
|
|
|
|
2000-09-19 13:37:09 +00:00
|
|
|
|
(defun nntp-async-wait (process wait-for buffer decode callback)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer (process-buffer process))
|
|
|
|
|
(unless nntp-inside-change-function
|
|
|
|
|
(erase-buffer))
|
|
|
|
|
(setq nntp-process-wait-for wait-for
|
|
|
|
|
nntp-process-to-buffer buffer
|
|
|
|
|
nntp-process-decode decode
|
|
|
|
|
nntp-process-callback callback
|
|
|
|
|
nntp-process-start-point (point-max))
|
|
|
|
|
(setq after-change-functions '(nntp-after-change-function))
|
|
|
|
|
(if nntp-async-needs-kluge
|
|
|
|
|
(nntp-async-kluge process))))
|
|
|
|
|
|
|
|
|
|
(defun nntp-async-kluge (process)
|
|
|
|
|
;; emacs 20.3 bug: process output with encoding 'binary
|
|
|
|
|
;; doesn't trigger after-change-functions.
|
|
|
|
|
(unless nntp-async-timer
|
|
|
|
|
(setq nntp-async-timer
|
|
|
|
|
(nnheader-run-at-time 1 1 'nntp-async-timer-handler)))
|
|
|
|
|
(add-to-list 'nntp-async-process-list process))
|
|
|
|
|
|
|
|
|
|
(defun nntp-async-timer-handler ()
|
|
|
|
|
(mapcar
|
|
|
|
|
(lambda (proc)
|
|
|
|
|
(if (memq (process-status proc) '(open run))
|
|
|
|
|
(nntp-async-trigger proc)
|
|
|
|
|
(nntp-async-stop proc)))
|
|
|
|
|
nntp-async-process-list))
|
|
|
|
|
|
|
|
|
|
(defun nntp-async-stop (proc)
|
|
|
|
|
(setq nntp-async-process-list (delq proc nntp-async-process-list))
|
|
|
|
|
(when (and nntp-async-timer (not nntp-async-process-list))
|
|
|
|
|
(nnheader-cancel-timer nntp-async-timer)
|
|
|
|
|
(setq nntp-async-timer nil)))
|
|
|
|
|
|
|
|
|
|
(defun nntp-after-change-function (beg end len)
|
|
|
|
|
(unwind-protect
|
|
|
|
|
;; we only care about insertions at eob
|
|
|
|
|
(when (and (eq 0 len) (eq (point-max) end))
|
|
|
|
|
(save-match-data
|
|
|
|
|
(let ((proc (get-buffer-process (current-buffer))))
|
|
|
|
|
(when proc
|
|
|
|
|
(nntp-async-trigger proc)))))
|
|
|
|
|
;; any throw from after-change-functions will leave it
|
|
|
|
|
;; set to nil. so we reset it here, if necessary.
|
|
|
|
|
(when quit-flag
|
|
|
|
|
(setq after-change-functions '(nntp-after-change-function)))))
|
|
|
|
|
|
|
|
|
|
(defun nntp-async-trigger (process)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer (process-buffer process))
|
|
|
|
|
(when nntp-process-callback
|
|
|
|
|
;; do we have an error message?
|
|
|
|
|
(goto-char nntp-process-start-point)
|
|
|
|
|
(if (memq (following-char) '(?4 ?5))
|
|
|
|
|
;; wants credentials?
|
|
|
|
|
(if (looking-at "480")
|
2000-11-17 18:23:03 +00:00
|
|
|
|
(nntp-handle-authinfo process)
|
2000-09-19 13:37:09 +00:00
|
|
|
|
;; report error message.
|
|
|
|
|
(nntp-snarf-error-message)
|
|
|
|
|
(nntp-do-callback nil))
|
|
|
|
|
|
|
|
|
|
;; got what we expect?
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(when (re-search-backward
|
|
|
|
|
nntp-process-wait-for nntp-process-start-point t)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(let ((response (match-string 0)))
|
|
|
|
|
(with-current-buffer nntp-server-buffer
|
|
|
|
|
(setq nntp-process-response response)))
|
2000-09-19 13:37:09 +00:00
|
|
|
|
(nntp-async-stop process)
|
|
|
|
|
;; convert it.
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(when (gnus-buffer-exists-p nntp-process-to-buffer)
|
2000-09-19 13:37:09 +00:00
|
|
|
|
(let ((buf (current-buffer))
|
|
|
|
|
(start nntp-process-start-point)
|
|
|
|
|
(decode nntp-process-decode))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(save-excursion
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(set-buffer nntp-process-to-buffer)
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(goto-char (point-max))
|
2000-09-19 13:37:09 +00:00
|
|
|
|
(save-restriction
|
|
|
|
|
(narrow-to-region (point) (point))
|
|
|
|
|
(insert-buffer-substring buf start)
|
|
|
|
|
(when decode
|
|
|
|
|
(nntp-decode-text))))))
|
|
|
|
|
;; report it.
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(nntp-do-callback
|
|
|
|
|
(buffer-name (get-buffer nntp-process-to-buffer))))))))
|
|
|
|
|
|
|
|
|
|
(defun nntp-do-callback (arg)
|
|
|
|
|
(let ((callback nntp-process-callback)
|
|
|
|
|
(nntp-inside-change-function t))
|
|
|
|
|
(setq nntp-process-callback nil)
|
|
|
|
|
(funcall callback arg)))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(defun nntp-snarf-error-message ()
|
|
|
|
|
"Save the error message in the current buffer."
|
|
|
|
|
(let ((message (buffer-string)))
|
|
|
|
|
(while (string-match "[\r\n]+" message)
|
|
|
|
|
(setq message (replace-match " " t t message)))
|
|
|
|
|
(nnheader-report 'nntp message)
|
|
|
|
|
message))
|
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(defun nntp-accept-process-output (process)
|
1997-04-16 22:13:18 +00:00
|
|
|
|
"Wait for output from PROCESS and message some dots."
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer (or (nntp-find-connection-buffer nntp-server-buffer)
|
|
|
|
|
nntp-server-buffer))
|
2003-02-11 17:00:45 +00:00
|
|
|
|
(let ((len (/ (buffer-size) 1024))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
message-log-max)
|
|
|
|
|
(unless (< len 10)
|
|
|
|
|
(setq nntp-have-messaged t)
|
|
|
|
|
(nnheader-message 7 "nntp read: %dk" len)))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(nnheader-accept-process-output process)
|
|
|
|
|
;; accept-process-output may update status of process to indicate
|
|
|
|
|
;; that the server has closed the connection. This MUST be
|
|
|
|
|
;; handled here as the buffer restored by the save-excursion may
|
|
|
|
|
;; be the process's former output buffer (i.e. now killed)
|
2005-08-06 19:51:42 +00:00
|
|
|
|
(or (and process
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(memq (process-status process) '(open run)))
|
|
|
|
|
(nntp-report "Server closed connection"))))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(defun nntp-accept-response ()
|
|
|
|
|
"Wait for output from the process that outputs to BUFFER."
|
|
|
|
|
(nntp-accept-process-output (nntp-find-connection nntp-server-buffer)))
|
|
|
|
|
|
|
|
|
|
(defun nntp-possibly-change-group (group server &optional connectionless)
|
|
|
|
|
(let ((nnheader-callback-function nil))
|
|
|
|
|
(when server
|
|
|
|
|
(or (nntp-server-opened server)
|
|
|
|
|
(nntp-open-server server nil connectionless)))
|
|
|
|
|
|
|
|
|
|
(unless connectionless
|
|
|
|
|
(or (nntp-find-connection nntp-server-buffer)
|
|
|
|
|
(nntp-open-connection nntp-server-buffer))))
|
|
|
|
|
|
|
|
|
|
(when group
|
|
|
|
|
(let ((entry (nntp-find-connection-entry nntp-server-buffer)))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(cond ((not entry)
|
|
|
|
|
(nntp-report "Server closed connection"))
|
|
|
|
|
((not (equal group (caddr entry)))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer (process-buffer (car entry)))
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(nntp-send-command "^[245].*\n" "GROUP" group)
|
|
|
|
|
(setcar (cddr entry) group)
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer nntp-server-buffer)
|
|
|
|
|
(erase-buffer))))))))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(defun nntp-decode-text (&optional cr-only)
|
|
|
|
|
"Decode the text in the current buffer."
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(while (search-forward "\r" nil t)
|
|
|
|
|
(delete-char -1))
|
|
|
|
|
(unless cr-only
|
|
|
|
|
;; Remove trailing ".\n" end-of-transfer marker.
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(forward-line -1)
|
|
|
|
|
(when (looking-at ".\n")
|
|
|
|
|
(delete-char 2))
|
|
|
|
|
;; Delete status line.
|
|
|
|
|
(goto-char (point-min))
|
2000-11-17 18:23:03 +00:00
|
|
|
|
(while (looking-at "[1-5][0-9][0-9] .*\n")
|
|
|
|
|
;; For some unknown reason, there is more than one status line.
|
|
|
|
|
(delete-region (point) (progn (forward-line 1) (point))))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
;; Remove "." -> ".." encoding.
|
|
|
|
|
(while (search-forward "\n.." nil t)
|
|
|
|
|
(delete-char -1))))
|
|
|
|
|
|
|
|
|
|
(defun nntp-encode-text ()
|
|
|
|
|
"Encode the text in the current buffer."
|
|
|
|
|
(save-excursion
|
|
|
|
|
;; Replace "." at beginning of line with "..".
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(while (re-search-forward "^\\." nil t)
|
|
|
|
|
(insert "."))
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
;; Insert newline at the end of the buffer.
|
|
|
|
|
(unless (bolp)
|
|
|
|
|
(insert "\n"))
|
|
|
|
|
;; Insert `.' at end of buffer (end of text mark).
|
|
|
|
|
(goto-char (point-max))
|
1998-08-13 06:20:33 +00:00
|
|
|
|
(insert ".\n")
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(while (not (eobp))
|
|
|
|
|
(end-of-line)
|
|
|
|
|
(delete-char 1)
|
|
|
|
|
(insert nntp-end-of-line))))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(defun nntp-retrieve-headers-with-xover (articles &optional fetch-old)
|
|
|
|
|
(set-buffer nntp-server-buffer)
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(cond
|
|
|
|
|
|
|
|
|
|
;; This server does not talk NOV.
|
|
|
|
|
((not nntp-server-xover)
|
|
|
|
|
nil)
|
|
|
|
|
|
|
|
|
|
;; We don't care about gaps.
|
|
|
|
|
((or (not nntp-nov-gap)
|
|
|
|
|
fetch-old)
|
|
|
|
|
(nntp-send-xover-command
|
|
|
|
|
(if fetch-old
|
|
|
|
|
(if (numberp fetch-old)
|
|
|
|
|
(max 1 (- (car articles) fetch-old))
|
|
|
|
|
1)
|
|
|
|
|
(car articles))
|
|
|
|
|
(car (last articles)) 'wait)
|
|
|
|
|
|
|
|
|
|
(goto-char (point-min))
|
2000-09-19 13:37:09 +00:00
|
|
|
|
(when (looking-at "[1-5][0-9][0-9] .*\n")
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(delete-region (point) (progn (forward-line 1) (point))))
|
|
|
|
|
(while (search-forward "\r" nil t)
|
|
|
|
|
(replace-match "" t t))
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(forward-line -1)
|
|
|
|
|
(when (looking-at "\\.")
|
|
|
|
|
(delete-region (point) (progn (forward-line 1) (point)))))
|
|
|
|
|
|
|
|
|
|
;; We do it the hard way. For each gap, an XOVER command is sent
|
|
|
|
|
;; to the server. We do not wait for a reply from the server, we
|
|
|
|
|
;; just send them off as fast as we can. That means that we have
|
|
|
|
|
;; to count the number of responses we get back to find out when we
|
|
|
|
|
;; have gotten all we asked for.
|
|
|
|
|
((numberp nntp-nov-gap)
|
|
|
|
|
(let ((count 0)
|
|
|
|
|
(received 0)
|
2000-09-19 13:37:09 +00:00
|
|
|
|
last-point
|
|
|
|
|
in-process-buffer-p
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(buf nntp-server-buffer)
|
2000-09-19 13:37:09 +00:00
|
|
|
|
(process-buffer (nntp-find-connection-buffer nntp-server-buffer))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
first last status)
|
1997-04-16 22:13:18 +00:00
|
|
|
|
;; We have to check `nntp-server-xover'. If it gets set to nil,
|
|
|
|
|
;; that means that the server does not understand XOVER, but we
|
|
|
|
|
;; won't know that until we try.
|
|
|
|
|
(while (and nntp-server-xover articles)
|
|
|
|
|
(setq first (car articles))
|
|
|
|
|
;; Search forward until we find a gap, or until we run out of
|
|
|
|
|
;; articles.
|
|
|
|
|
(while (and (cdr articles)
|
|
|
|
|
(< (- (nth 1 articles) (car articles)) nntp-nov-gap))
|
|
|
|
|
(setq articles (cdr articles)))
|
|
|
|
|
|
2000-09-19 13:37:09 +00:00
|
|
|
|
(setq in-process-buffer-p (stringp nntp-server-xover))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(nntp-send-xover-command first (setq last (car articles)))
|
|
|
|
|
(setq articles (cdr articles))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
2000-09-19 13:37:09 +00:00
|
|
|
|
(when (and nntp-server-xover in-process-buffer-p)
|
|
|
|
|
;; Don't count tried request.
|
|
|
|
|
(setq count (1+ count))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
|
1997-04-16 22:13:18 +00:00
|
|
|
|
;; Every 400 requests we have to read the stream in
|
|
|
|
|
;; order to avoid deadlocks.
|
|
|
|
|
(when (or (null articles) ;All requests have been sent.
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(= 1 (% count nntp-maximum-request)))
|
2000-09-19 13:37:09 +00:00
|
|
|
|
|
|
|
|
|
(nntp-accept-response)
|
|
|
|
|
;; On some Emacs versions the preceding function has a
|
|
|
|
|
;; tendency to change the buffer. Perhaps. It's quite
|
|
|
|
|
;; difficult to reproduce, because it only seems to happen
|
|
|
|
|
;; once in a blue moon.
|
|
|
|
|
(set-buffer process-buffer)
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(while (progn
|
2000-09-19 13:37:09 +00:00
|
|
|
|
(goto-char (or last-point (point-min)))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
;; Count replies.
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(while (re-search-forward "^\\([0-9][0-9][0-9]\\) .*\n"
|
|
|
|
|
nil t)
|
|
|
|
|
(incf received)
|
|
|
|
|
(setq status (match-string 1))
|
|
|
|
|
(if (string-match "^[45]" status)
|
|
|
|
|
(setq status 'error)
|
|
|
|
|
(setq status 'ok)))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(setq last-point (point))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(or (< received count)
|
|
|
|
|
(if (eq status 'error)
|
|
|
|
|
nil
|
|
|
|
|
;; I haven't started reading the final response
|
|
|
|
|
(progn
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(forward-line -1)
|
|
|
|
|
(not (looking-at "^\\.\r?\n"))))))
|
|
|
|
|
;; I haven't read the end of the final response
|
2000-09-19 13:37:09 +00:00
|
|
|
|
(nntp-accept-response)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(set-buffer process-buffer))))
|
|
|
|
|
|
|
|
|
|
;; Some nntp servers seem to have an extension to the XOVER
|
|
|
|
|
;; extension. On these servers, requesting an article range
|
|
|
|
|
;; preceeding the active range does not return an error as
|
|
|
|
|
;; specified in the RFC. What we instead get is the NOV entry
|
|
|
|
|
;; for the first available article. Obviously, a client can
|
|
|
|
|
;; use that entry to avoid making unnecessary requests. The
|
|
|
|
|
;; only problem is for a client that assumes that the response
|
|
|
|
|
;; will always be within the requested ranage. For such a
|
|
|
|
|
;; client, we can get N copies of the same entry (one for each
|
|
|
|
|
;; XOVER command sent to the server).
|
|
|
|
|
|
|
|
|
|
(when (<= count 1)
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(when (re-search-forward "^[0-9][0-9][0-9] .*\n\\([0-9]+\\)" nil t)
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-339
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 76)
- Update from CVS
2005-05-30 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-agent.el (gnus-agent-regenerate-group)
(gnus-agent-fetch-articles): Replace `string-to-int' by
`string-to-number'.
* lisp/gnus/gnus-art.el (gnus-button-fetch-group): Ditto.
* lisp/gnus/gnus-cache.el (gnus-cache-generate-active)
(gnus-cache-articles-in-group): Ditto.
* lisp/gnus/gnus-group.el (gnus-group-set-current-level)
(gnus-group-insert-group-line): Ditto.
* lisp/gnus/gnus-score.el (gnus-score-set-expunge-below)
(gnus-score-set-mark-below, gnus-summary-score-effect)
(gnus-summary-score-entry): Ditto.
* lisp/gnus/gnus-soup.el (gnus-soup-send-packet, gnus-soup-parse-areas)
(gnus-soup-pack): Ditto.
* lisp/gnus/gnus-spec.el (gnus-xmas-format): Ditto.
* lisp/gnus/gnus-start.el (gnus-newsrc-to-gnus-format): Ditto.
* lisp/gnus/gnus-sum.el (gnus-create-xref-hashtb): Ditto.
* lisp/gnus/gnus-uu.el (gnus-uu-expand-numbers): Ditto.
* lisp/gnus/nnbabyl.el (nnbabyl-article-group-number): Ditto.
* lisp/gnus/nndb.el (nndb-get-remote-expire-response): Ditto.
* lisp/gnus/nndiary.el (nndiary-parse-schedule-value)
(nndiary-string-to-number, nndiary-request-replace-article)
(nndiary-request-article): Ditto.
* lisp/gnus/nndoc.el (nndoc-rnews-body-end, nndoc-mbox-body-end): Ditto.
* lisp/gnus/nndraft.el (nndraft-articles, nndraft-request-group): Ditto.
* lisp/gnus/nneething.el (nneething-make-head): Ditto.
* lisp/gnus/nnfolder.el (nnfolder-request-article)
(nnfolder-retrieve-headers): Ditto.
* lisp/gnus/nnheader.el (nnheader-file-to-number): Ditto.
* lisp/gnus/nnkiboze.el (nnkiboze-request-article): Ditto.
* lisp/gnus/nnmail.el (nnmail-process-unix-mail-format)
(nnmail-process-babyl-mail-format): Ditto.
* lisp/gnus/nnmbox.el (nnmbox-read-mbox, nnmbox-article-group-number): Ditto.
* lisp/gnus/nnmh.el (nnmh-update-gnus-unreads, nnmh-active-number)
(nnmh-request-create-group, nnmh-request-list-1)
(nnmh-request-group, nnmh-request-article): Ditto.
* lisp/gnus/nnml.el (nnml-request-replace-article, nnml-request-article): Ditto.
* lisp/gnus/nnrss.el (nnrss-find-rss-via-syndic8): Ditto.
* lisp/gnus/nnsoup.el (nnsoup-make-active): Ditto.
* lisp/gnus/nnspool.el (nnspool-find-id, nnspool-request-group): Ditto.
* lisp/gnus/nntp.el (nntp-find-group-and-number)
(nntp-retrieve-headers-with-xover): Ditto.
* lisp/gnus/pgg-gpg.el (pgg-gpg-snarf-keys-region): Ditto.
* lisp/gnus/pgg-parse.el (pgg-read-body, pgg-read-bytes)
(pgg-format-key-identifier): Ditto.
* lisp/gnus/pop3.el (pop3-last, pop3-stat): Ditto.
* lisp/gnus/qp.el (quoted-printable-decode-region): Ditto.
* lisp/gnus/spam-report.el (spam-report-url-ping-mm-url): Use format instead
of concat.
2005-05-30 17:13:58 +00:00
|
|
|
|
(let ((low-limit (string-to-number
|
2005-08-06 19:51:42 +00:00
|
|
|
|
(buffer-substring (match-beginning 1)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(match-end 1)))))
|
|
|
|
|
(while (and articles (<= (car articles) low-limit))
|
|
|
|
|
(setq articles (cdr articles))))))
|
|
|
|
|
(set-buffer buf))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(when nntp-server-xover
|
2000-09-19 13:37:09 +00:00
|
|
|
|
(when in-process-buffer-p
|
|
|
|
|
(set-buffer buf)
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(insert-buffer-substring process-buffer)
|
|
|
|
|
(set-buffer process-buffer)
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(set-buffer buf))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
;; We remove any "." lines and status lines.
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(while (search-forward "\r" nil t)
|
|
|
|
|
(delete-char -1))
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(delete-matching-lines "^\\.$\\|^[1-5][0-9][0-9] ")
|
|
|
|
|
t))))
|
|
|
|
|
|
|
|
|
|
nntp-server-xover)
|
|
|
|
|
|
|
|
|
|
(defun nntp-send-xover-command (beg end &optional wait-for-reply)
|
|
|
|
|
"Send the XOVER command to the server."
|
|
|
|
|
(let ((range (format "%d-%d" beg end))
|
|
|
|
|
(nntp-inhibit-erase t))
|
|
|
|
|
(if (stringp nntp-server-xover)
|
|
|
|
|
;; If `nntp-server-xover' is a string, then we just send this
|
|
|
|
|
;; command.
|
|
|
|
|
(if wait-for-reply
|
|
|
|
|
(nntp-send-command-nodelete
|
|
|
|
|
"\r?\n\\.\r?\n" nntp-server-xover range)
|
|
|
|
|
;; We do not wait for the reply.
|
2000-09-19 13:37:09 +00:00
|
|
|
|
(nntp-send-command-nodelete nil nntp-server-xover range))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(let ((commands nntp-xover-commands))
|
|
|
|
|
;; `nntp-xover-commands' is a list of possible XOVER commands.
|
|
|
|
|
;; We try them all until we get at positive response.
|
|
|
|
|
(while (and commands (eq nntp-server-xover 'try))
|
|
|
|
|
(nntp-send-command-nodelete "\r?\n\\.\r?\n" (car commands) range)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer nntp-server-buffer)
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(and (looking-at "[23]") ; No error message.
|
|
|
|
|
;; We also have to look at the lines. Some buggy
|
|
|
|
|
;; servers give back simple lines with just the
|
|
|
|
|
;; article number. How... helpful.
|
|
|
|
|
(progn
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(looking-at "[0-9]+\t...")) ; More text after number.
|
|
|
|
|
(setq nntp-server-xover (car commands))))
|
|
|
|
|
(setq commands (cdr commands)))
|
|
|
|
|
;; If none of the commands worked, we disable XOVER.
|
|
|
|
|
(when (eq nntp-server-xover 'try)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer nntp-server-buffer)
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(setq nntp-server-xover nil)))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
nntp-server-xover))))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(defun nntp-find-group-and-number (&optional group)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(save-restriction
|
|
|
|
|
(set-buffer nntp-server-buffer)
|
|
|
|
|
(narrow-to-region (goto-char (point-min))
|
|
|
|
|
(or (search-forward "\n\n" nil t) (point-max)))
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
;; We first find the number by looking at the status line.
|
|
|
|
|
(let ((number (and (looking-at "2[0-9][0-9] +\\([0-9]+\\) ")
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-339
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 76)
- Update from CVS
2005-05-30 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-agent.el (gnus-agent-regenerate-group)
(gnus-agent-fetch-articles): Replace `string-to-int' by
`string-to-number'.
* lisp/gnus/gnus-art.el (gnus-button-fetch-group): Ditto.
* lisp/gnus/gnus-cache.el (gnus-cache-generate-active)
(gnus-cache-articles-in-group): Ditto.
* lisp/gnus/gnus-group.el (gnus-group-set-current-level)
(gnus-group-insert-group-line): Ditto.
* lisp/gnus/gnus-score.el (gnus-score-set-expunge-below)
(gnus-score-set-mark-below, gnus-summary-score-effect)
(gnus-summary-score-entry): Ditto.
* lisp/gnus/gnus-soup.el (gnus-soup-send-packet, gnus-soup-parse-areas)
(gnus-soup-pack): Ditto.
* lisp/gnus/gnus-spec.el (gnus-xmas-format): Ditto.
* lisp/gnus/gnus-start.el (gnus-newsrc-to-gnus-format): Ditto.
* lisp/gnus/gnus-sum.el (gnus-create-xref-hashtb): Ditto.
* lisp/gnus/gnus-uu.el (gnus-uu-expand-numbers): Ditto.
* lisp/gnus/nnbabyl.el (nnbabyl-article-group-number): Ditto.
* lisp/gnus/nndb.el (nndb-get-remote-expire-response): Ditto.
* lisp/gnus/nndiary.el (nndiary-parse-schedule-value)
(nndiary-string-to-number, nndiary-request-replace-article)
(nndiary-request-article): Ditto.
* lisp/gnus/nndoc.el (nndoc-rnews-body-end, nndoc-mbox-body-end): Ditto.
* lisp/gnus/nndraft.el (nndraft-articles, nndraft-request-group): Ditto.
* lisp/gnus/nneething.el (nneething-make-head): Ditto.
* lisp/gnus/nnfolder.el (nnfolder-request-article)
(nnfolder-retrieve-headers): Ditto.
* lisp/gnus/nnheader.el (nnheader-file-to-number): Ditto.
* lisp/gnus/nnkiboze.el (nnkiboze-request-article): Ditto.
* lisp/gnus/nnmail.el (nnmail-process-unix-mail-format)
(nnmail-process-babyl-mail-format): Ditto.
* lisp/gnus/nnmbox.el (nnmbox-read-mbox, nnmbox-article-group-number): Ditto.
* lisp/gnus/nnmh.el (nnmh-update-gnus-unreads, nnmh-active-number)
(nnmh-request-create-group, nnmh-request-list-1)
(nnmh-request-group, nnmh-request-article): Ditto.
* lisp/gnus/nnml.el (nnml-request-replace-article, nnml-request-article): Ditto.
* lisp/gnus/nnrss.el (nnrss-find-rss-via-syndic8): Ditto.
* lisp/gnus/nnsoup.el (nnsoup-make-active): Ditto.
* lisp/gnus/nnspool.el (nnspool-find-id, nnspool-request-group): Ditto.
* lisp/gnus/nntp.el (nntp-find-group-and-number)
(nntp-retrieve-headers-with-xover): Ditto.
* lisp/gnus/pgg-gpg.el (pgg-gpg-snarf-keys-region): Ditto.
* lisp/gnus/pgg-parse.el (pgg-read-body, pgg-read-bytes)
(pgg-format-key-identifier): Ditto.
* lisp/gnus/pop3.el (pop3-last, pop3-stat): Ditto.
* lisp/gnus/qp.el (quoted-printable-decode-region): Ditto.
* lisp/gnus/spam-report.el (spam-report-url-ping-mm-url): Use format instead
of concat.
2005-05-30 17:13:58 +00:00
|
|
|
|
(string-to-number
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(buffer-substring (match-beginning 1)
|
|
|
|
|
(match-end 1)))))
|
|
|
|
|
newsgroups xref)
|
|
|
|
|
(and number (zerop number) (setq number nil))
|
|
|
|
|
(if number
|
|
|
|
|
;; Then we find the group name.
|
|
|
|
|
(setq group
|
|
|
|
|
(cond
|
|
|
|
|
;; If there is only one group in the Newsgroups
|
|
|
|
|
;; header, then it seems quite likely that this
|
|
|
|
|
;; article comes from that group, I'd say.
|
|
|
|
|
((and (setq newsgroups
|
|
|
|
|
(mail-fetch-field "newsgroups"))
|
|
|
|
|
(not (string-match "," newsgroups)))
|
|
|
|
|
newsgroups)
|
|
|
|
|
;; If there is more than one group in the
|
|
|
|
|
;; Newsgroups header, then the Xref header should
|
|
|
|
|
;; be filled out. We hazard a guess that the group
|
|
|
|
|
;; that has this article number in the Xref header
|
|
|
|
|
;; is the one we are looking for. This might very
|
|
|
|
|
;; well be wrong if this article happens to have
|
|
|
|
|
;; the same number in several groups, but that's
|
|
|
|
|
;; life.
|
|
|
|
|
((and (setq xref (mail-fetch-field "xref"))
|
|
|
|
|
number
|
|
|
|
|
(string-match
|
|
|
|
|
(format "\\([^ :]+\\):%d" number) xref))
|
|
|
|
|
(match-string 1 xref))
|
|
|
|
|
(t "")))
|
|
|
|
|
(cond
|
|
|
|
|
((and (setq xref (mail-fetch-field "xref"))
|
|
|
|
|
(string-match
|
|
|
|
|
(if group
|
|
|
|
|
(concat "\\(" (regexp-quote group) "\\):\\([0-9]+\\)")
|
|
|
|
|
"\\([^ :]+\\):\\([0-9]+\\)")
|
|
|
|
|
xref))
|
|
|
|
|
(setq group (match-string 1 xref)
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-339
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 76)
- Update from CVS
2005-05-30 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-agent.el (gnus-agent-regenerate-group)
(gnus-agent-fetch-articles): Replace `string-to-int' by
`string-to-number'.
* lisp/gnus/gnus-art.el (gnus-button-fetch-group): Ditto.
* lisp/gnus/gnus-cache.el (gnus-cache-generate-active)
(gnus-cache-articles-in-group): Ditto.
* lisp/gnus/gnus-group.el (gnus-group-set-current-level)
(gnus-group-insert-group-line): Ditto.
* lisp/gnus/gnus-score.el (gnus-score-set-expunge-below)
(gnus-score-set-mark-below, gnus-summary-score-effect)
(gnus-summary-score-entry): Ditto.
* lisp/gnus/gnus-soup.el (gnus-soup-send-packet, gnus-soup-parse-areas)
(gnus-soup-pack): Ditto.
* lisp/gnus/gnus-spec.el (gnus-xmas-format): Ditto.
* lisp/gnus/gnus-start.el (gnus-newsrc-to-gnus-format): Ditto.
* lisp/gnus/gnus-sum.el (gnus-create-xref-hashtb): Ditto.
* lisp/gnus/gnus-uu.el (gnus-uu-expand-numbers): Ditto.
* lisp/gnus/nnbabyl.el (nnbabyl-article-group-number): Ditto.
* lisp/gnus/nndb.el (nndb-get-remote-expire-response): Ditto.
* lisp/gnus/nndiary.el (nndiary-parse-schedule-value)
(nndiary-string-to-number, nndiary-request-replace-article)
(nndiary-request-article): Ditto.
* lisp/gnus/nndoc.el (nndoc-rnews-body-end, nndoc-mbox-body-end): Ditto.
* lisp/gnus/nndraft.el (nndraft-articles, nndraft-request-group): Ditto.
* lisp/gnus/nneething.el (nneething-make-head): Ditto.
* lisp/gnus/nnfolder.el (nnfolder-request-article)
(nnfolder-retrieve-headers): Ditto.
* lisp/gnus/nnheader.el (nnheader-file-to-number): Ditto.
* lisp/gnus/nnkiboze.el (nnkiboze-request-article): Ditto.
* lisp/gnus/nnmail.el (nnmail-process-unix-mail-format)
(nnmail-process-babyl-mail-format): Ditto.
* lisp/gnus/nnmbox.el (nnmbox-read-mbox, nnmbox-article-group-number): Ditto.
* lisp/gnus/nnmh.el (nnmh-update-gnus-unreads, nnmh-active-number)
(nnmh-request-create-group, nnmh-request-list-1)
(nnmh-request-group, nnmh-request-article): Ditto.
* lisp/gnus/nnml.el (nnml-request-replace-article, nnml-request-article): Ditto.
* lisp/gnus/nnrss.el (nnrss-find-rss-via-syndic8): Ditto.
* lisp/gnus/nnsoup.el (nnsoup-make-active): Ditto.
* lisp/gnus/nnspool.el (nnspool-find-id, nnspool-request-group): Ditto.
* lisp/gnus/nntp.el (nntp-find-group-and-number)
(nntp-retrieve-headers-with-xover): Ditto.
* lisp/gnus/pgg-gpg.el (pgg-gpg-snarf-keys-region): Ditto.
* lisp/gnus/pgg-parse.el (pgg-read-body, pgg-read-bytes)
(pgg-format-key-identifier): Ditto.
* lisp/gnus/pop3.el (pop3-last, pop3-stat): Ditto.
* lisp/gnus/qp.el (quoted-printable-decode-region): Ditto.
* lisp/gnus/spam-report.el (spam-report-url-ping-mm-url): Use format instead
of concat.
2005-05-30 17:13:58 +00:00
|
|
|
|
number (string-to-number (match-string 2 xref))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
((and (setq newsgroups
|
|
|
|
|
(mail-fetch-field "newsgroups"))
|
|
|
|
|
(not (string-match "," newsgroups)))
|
|
|
|
|
(setq group newsgroups))
|
|
|
|
|
(group)
|
|
|
|
|
(t (setq group ""))))
|
|
|
|
|
(when (string-match "\r" group)
|
|
|
|
|
(setq group (substring group 0 (match-beginning 0))))
|
|
|
|
|
(cons group number)))))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(defun nntp-wait-for-string (regexp)
|
|
|
|
|
"Wait until string arrives in the buffer."
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(let ((buf (current-buffer))
|
|
|
|
|
proc)
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(goto-char (point-min))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(while (and (setq proc (get-buffer-process buf))
|
|
|
|
|
(memq (process-status proc) '(open run))
|
|
|
|
|
(not (re-search-forward regexp nil t)))
|
|
|
|
|
(accept-process-output proc)
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(set-buffer buf)
|
|
|
|
|
(goto-char (point-min)))))
|
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
|
|
;; ==========================================================================
|
|
|
|
|
;; Obsolete nntp-open-* connection methods -- drv
|
|
|
|
|
;; ==========================================================================
|
|
|
|
|
|
|
|
|
|
(defvoo nntp-open-telnet-envuser nil
|
|
|
|
|
"*If non-nil, telnet session (client and server both) will support the ENVIRON option and not prompt for login name.")
|
|
|
|
|
|
|
|
|
|
(defvoo nntp-telnet-shell-prompt "bash\\|\$ *\r?$\\|> *\r?"
|
|
|
|
|
"*Regular expression to match the shell prompt on the remote machine.")
|
|
|
|
|
|
|
|
|
|
(defvoo nntp-rlogin-program "rsh"
|
|
|
|
|
"*Program used to log in on remote machines.
|
|
|
|
|
The default is \"rsh\", but \"ssh\" is a popular alternative.")
|
|
|
|
|
|
|
|
|
|
(defvoo nntp-rlogin-parameters '("telnet" "-8" "${NNTPSERVER:=news}" "nntp")
|
|
|
|
|
"*Parameters to `nntp-open-rlogin'.
|
|
|
|
|
That function may be used as `nntp-open-connection-function'. In that
|
|
|
|
|
case, this list will be used as the parameter list given to rsh.")
|
|
|
|
|
|
|
|
|
|
(defvoo nntp-rlogin-user-name nil
|
|
|
|
|
"*User name on remote system when using the rlogin connect method.")
|
|
|
|
|
|
|
|
|
|
(defvoo nntp-telnet-parameters
|
|
|
|
|
'("exec" "telnet" "-8" "${NNTPSERVER:=news}" "nntp")
|
|
|
|
|
"*Parameters to `nntp-open-telnet'.
|
|
|
|
|
That function may be used as `nntp-open-connection-function'. In that
|
|
|
|
|
case, this list will be executed as a command after logging in
|
|
|
|
|
via telnet.")
|
|
|
|
|
|
|
|
|
|
(defvoo nntp-telnet-user-name nil
|
|
|
|
|
"User name to log in via telnet with.")
|
|
|
|
|
|
|
|
|
|
(defvoo nntp-telnet-passwd nil
|
|
|
|
|
"Password to use to log in via telnet with.")
|
|
|
|
|
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(defun nntp-open-telnet (buffer)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer buffer)
|
|
|
|
|
(erase-buffer)
|
1997-09-24 01:50:24 +00:00
|
|
|
|
(let ((proc (apply
|
|
|
|
|
'start-process
|
|
|
|
|
"nntpd" buffer nntp-telnet-command nntp-telnet-switches))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(case-fold-search t))
|
|
|
|
|
(when (memq (process-status proc) '(open run))
|
2000-11-17 18:23:03 +00:00
|
|
|
|
(nntp-wait-for-string "^r?telnet")
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(process-send-string proc "set escape \^X\n")
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(cond
|
|
|
|
|
((and nntp-open-telnet-envuser nntp-telnet-user-name)
|
|
|
|
|
(process-send-string proc (concat "open " "-l" nntp-telnet-user-name
|
|
|
|
|
nntp-address "\n")))
|
|
|
|
|
(t
|
|
|
|
|
(process-send-string proc (concat "open " nntp-address "\n"))))
|
|
|
|
|
(cond
|
|
|
|
|
((not nntp-open-telnet-envuser)
|
|
|
|
|
(nntp-wait-for-string "^\r*.?login:")
|
|
|
|
|
(process-send-string
|
|
|
|
|
proc (concat
|
|
|
|
|
(or nntp-telnet-user-name
|
|
|
|
|
(setq nntp-telnet-user-name (read-string "login: ")))
|
|
|
|
|
"\n"))))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(nntp-wait-for-string "^\r*.?password:")
|
|
|
|
|
(process-send-string
|
|
|
|
|
proc (concat
|
|
|
|
|
(or nntp-telnet-passwd
|
|
|
|
|
(setq nntp-telnet-passwd
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(read-passwd "Password: ")))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
"\n"))
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(nntp-wait-for-string nntp-telnet-shell-prompt)
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(process-send-string
|
|
|
|
|
proc (concat (mapconcat 'identity nntp-telnet-parameters " ") "\n"))
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(nntp-wait-for-string "^\r*20[01]")
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(delete-region (point-min) (point))
|
|
|
|
|
(process-send-string proc "\^]")
|
2000-11-17 18:23:03 +00:00
|
|
|
|
(nntp-wait-for-string "^r?telnet")
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(process-send-string proc "mode character\n")
|
|
|
|
|
(accept-process-output proc 1)
|
|
|
|
|
(sit-for 1)
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(delete-region (point) (point-max)))
|
|
|
|
|
proc)))
|
|
|
|
|
|
|
|
|
|
(defun nntp-open-rlogin (buffer)
|
|
|
|
|
"Open a connection to SERVER using rsh."
|
|
|
|
|
(let ((proc (if nntp-rlogin-user-name
|
1999-02-20 14:05:57 +00:00
|
|
|
|
(apply 'start-process
|
|
|
|
|
"nntpd" buffer nntp-rlogin-program
|
|
|
|
|
nntp-address "-l" nntp-rlogin-user-name
|
|
|
|
|
nntp-rlogin-parameters)
|
|
|
|
|
(apply 'start-process
|
|
|
|
|
"nntpd" buffer nntp-rlogin-program nntp-address
|
|
|
|
|
nntp-rlogin-parameters))))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer buffer)
|
|
|
|
|
(nntp-wait-for-string "^\r*20[01]")
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(delete-region (point-min) (point))
|
|
|
|
|
proc)))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
|
|
;; ==========================================================================
|
|
|
|
|
;; Replacements for the nntp-open-* functions -- drv
|
|
|
|
|
;; ==========================================================================
|
|
|
|
|
|
|
|
|
|
(defun nntp-open-telnet-stream (buffer)
|
|
|
|
|
"Open a nntp connection by telnet'ing the news server.
|
|
|
|
|
|
|
|
|
|
Please refer to the following variables to customize the connection:
|
|
|
|
|
- `nntp-pre-command',
|
|
|
|
|
- `nntp-telnet-command',
|
|
|
|
|
- `nntp-telnet-switches',
|
|
|
|
|
- `nntp-address',
|
|
|
|
|
- `nntp-port-number',
|
|
|
|
|
- `nntp-end-of-line'."
|
|
|
|
|
(let ((command `(,nntp-telnet-command
|
|
|
|
|
,@nntp-telnet-switches
|
|
|
|
|
,nntp-address ,nntp-port-number))
|
|
|
|
|
proc)
|
|
|
|
|
(and nntp-pre-command
|
|
|
|
|
(push nntp-pre-command command))
|
|
|
|
|
(setq proc (apply 'start-process "nntpd" buffer command))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer buffer)
|
|
|
|
|
(nntp-wait-for-string "^\r*20[01]")
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(delete-region (point-min) (point))
|
|
|
|
|
proc)))
|
|
|
|
|
|
|
|
|
|
(defun nntp-open-via-rlogin-and-telnet (buffer)
|
|
|
|
|
"Open a connection to an nntp server through an intermediate host.
|
|
|
|
|
First rlogin to the remote host, and then telnet the real news server
|
|
|
|
|
from there.
|
|
|
|
|
|
|
|
|
|
Please refer to the following variables to customize the connection:
|
|
|
|
|
- `nntp-pre-command',
|
|
|
|
|
- `nntp-via-rlogin-command',
|
|
|
|
|
- `nntp-via-rlogin-command-switches',
|
|
|
|
|
- `nntp-via-user-name',
|
|
|
|
|
- `nntp-via-address',
|
|
|
|
|
- `nntp-telnet-command',
|
|
|
|
|
- `nntp-telnet-switches',
|
|
|
|
|
- `nntp-address',
|
|
|
|
|
- `nntp-port-number',
|
|
|
|
|
- `nntp-end-of-line'."
|
|
|
|
|
(let ((command `(,nntp-via-address
|
|
|
|
|
,nntp-telnet-command
|
|
|
|
|
,@nntp-telnet-switches))
|
|
|
|
|
proc)
|
|
|
|
|
(when nntp-via-user-name
|
|
|
|
|
(setq command `("-l" ,nntp-via-user-name ,@command)))
|
|
|
|
|
(when nntp-via-rlogin-command-switches
|
|
|
|
|
(setq command (append nntp-via-rlogin-command-switches command)))
|
|
|
|
|
(push nntp-via-rlogin-command command)
|
|
|
|
|
(and nntp-pre-command
|
|
|
|
|
(push nntp-pre-command command))
|
|
|
|
|
(setq proc (apply 'start-process "nntpd" buffer command))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer buffer)
|
|
|
|
|
(nntp-wait-for-string "^r?telnet")
|
|
|
|
|
(process-send-string proc (concat "open " nntp-address
|
|
|
|
|
" " nntp-port-number "\n"))
|
|
|
|
|
(nntp-wait-for-string "^\r*20[01]")
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(delete-region (point-min) (point))
|
|
|
|
|
(process-send-string proc "\^]")
|
|
|
|
|
(nntp-wait-for-string "^r?telnet")
|
|
|
|
|
(process-send-string proc "mode character\n")
|
|
|
|
|
(accept-process-output proc 1)
|
|
|
|
|
(sit-for 1)
|
1997-04-16 22:13:18 +00:00
|
|
|
|
(goto-char (point-min))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
(forward-line 1)
|
|
|
|
|
(delete-region (point) (point-max)))
|
|
|
|
|
proc))
|
|
|
|
|
|
|
|
|
|
(defun nntp-open-via-telnet-and-telnet (buffer)
|
|
|
|
|
"Open a connection to an nntp server through an intermediate host.
|
|
|
|
|
First telnet the remote host, and then telnet the real news server
|
|
|
|
|
from there.
|
|
|
|
|
|
|
|
|
|
Please refer to the following variables to customize the connection:
|
|
|
|
|
- `nntp-pre-command',
|
|
|
|
|
- `nntp-via-telnet-command',
|
|
|
|
|
- `nntp-via-telnet-switches',
|
|
|
|
|
- `nntp-via-address',
|
|
|
|
|
- `nntp-via-envuser',
|
|
|
|
|
- `nntp-via-user-name',
|
|
|
|
|
- `nntp-via-user-password',
|
|
|
|
|
- `nntp-via-shell-prompt',
|
|
|
|
|
- `nntp-telnet-command',
|
|
|
|
|
- `nntp-telnet-switches',
|
|
|
|
|
- `nntp-address',
|
|
|
|
|
- `nntp-port-number',
|
|
|
|
|
- `nntp-end-of-line'."
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer buffer)
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(let ((command `(,nntp-via-telnet-command ,@nntp-via-telnet-switches))
|
|
|
|
|
(case-fold-search t)
|
|
|
|
|
proc)
|
|
|
|
|
(and nntp-pre-command (push nntp-pre-command command))
|
|
|
|
|
(setq proc (apply 'start-process "nntpd" buffer command))
|
|
|
|
|
(when (memq (process-status proc) '(open run))
|
|
|
|
|
(nntp-wait-for-string "^r?telnet")
|
|
|
|
|
(process-send-string proc "set escape \^X\n")
|
|
|
|
|
(cond
|
|
|
|
|
((and nntp-via-envuser nntp-via-user-name)
|
|
|
|
|
(process-send-string proc (concat "open " "-l" nntp-via-user-name
|
|
|
|
|
nntp-via-address "\n")))
|
|
|
|
|
(t
|
|
|
|
|
(process-send-string proc (concat "open " nntp-via-address
|
|
|
|
|
"\n"))))
|
|
|
|
|
(when (not nntp-via-envuser)
|
|
|
|
|
(nntp-wait-for-string "^\r*.?login:")
|
|
|
|
|
(process-send-string proc
|
|
|
|
|
(concat
|
|
|
|
|
(or nntp-via-user-name
|
|
|
|
|
(setq nntp-via-user-name
|
|
|
|
|
(read-string "login: ")))
|
|
|
|
|
"\n")))
|
|
|
|
|
(nntp-wait-for-string "^\r*.?password:")
|
|
|
|
|
(process-send-string proc
|
|
|
|
|
(concat
|
|
|
|
|
(or nntp-via-user-password
|
|
|
|
|
(setq nntp-via-user-password
|
|
|
|
|
(read-passwd "Password: ")))
|
|
|
|
|
"\n"))
|
|
|
|
|
(nntp-wait-for-string nntp-via-shell-prompt)
|
|
|
|
|
(let ((real-telnet-command `("exec"
|
|
|
|
|
,nntp-telnet-command
|
|
|
|
|
,@nntp-telnet-switches
|
|
|
|
|
,nntp-address
|
|
|
|
|
,nntp-port-number)))
|
|
|
|
|
(process-send-string proc
|
|
|
|
|
(concat (mapconcat 'identity
|
|
|
|
|
real-telnet-command " ")
|
|
|
|
|
"\n")))
|
|
|
|
|
(nntp-wait-for-string "^\r*20[01]")
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(delete-region (point-min) (point))
|
|
|
|
|
(process-send-string proc "\^]")
|
|
|
|
|
(nntp-wait-for-string "^r?telnet")
|
|
|
|
|
(process-send-string proc "mode character\n")
|
|
|
|
|
(accept-process-output proc 1)
|
|
|
|
|
(sit-for 1)
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(delete-region (point) (point-max)))
|
|
|
|
|
proc)))
|
1997-04-16 22:13:18 +00:00
|
|
|
|
|
|
|
|
|
(provide 'nntp)
|
|
|
|
|
|
2003-09-01 15:45:59 +00:00
|
|
|
|
;;; arch-tag: 8655466a-b1b5-4929-9c45-7b1b2e767271
|
1997-04-16 22:13:18 +00:00
|
|
|
|
;;; nntp.el ends here
|