diff options
| author | Lars Ingebrigtsen | 2012-12-28 12:26:54 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka | 2012-12-28 12:26:54 +0000 |
| commit | b9989bfa7e59b423df76b184e657b66017f72ff9 (patch) | |
| tree | 85b5cc50e6a59ad908f3b63e0a5abcb2a77f2b0f | |
| parent | e25a10b7141982f3b52ec59223503b36d4564378 (diff) | |
| download | emacs-b9989bfa7e59b423df76b184e657b66017f72ff9.tar.gz emacs-b9989bfa7e59b423df76b184e657b66017f72ff9.zip | |
lisp/gnus/nntp.el (nntp-open-connection): Fix nntp connection problems with the Typhoon server
| -rw-r--r-- | lisp/gnus/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/gnus/nntp.el | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 4450dde0cd8..b9df3bb9cf7 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2012-12-27 Lars Ingebrigtsen <larsi@gnus.org> | ||
| 2 | |||
| 3 | * nntp.el (nntp-open-connection): Use HELP as the capability command | ||
| 4 | instead of CAPABILITY because Typhoon v2.2.2.503 chokes completely on | ||
| 5 | unknown commands. And CAPABILITY is an unknown command (bug#12763). | ||
| 6 | |||
| 1 | 2012-12-27 Wolfgang Jenkner <wjenkner@inode.at> | 7 | 2012-12-27 Wolfgang Jenkner <wjenkner@inode.at> |
| 2 | 8 | ||
| 3 | * gnus-spec.el (gnus-face-face-function): Don't use nil as no-op face | 9 | * gnus-spec.el (gnus-face-face-function): Don't use nil as no-op face |
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el index be5d1e6ff4c..e131c51c09d 100644 --- a/lisp/gnus/nntp.el +++ b/lisp/gnus/nntp.el | |||
| @@ -1282,7 +1282,7 @@ If SEND-IF-FORCE, only send authinfo to the server if the | |||
| 1282 | "nntpd" pbuffer nntp-address nntp-port-number | 1282 | "nntpd" pbuffer nntp-address nntp-port-number |
| 1283 | :type (cadr (assoc nntp-open-connection-function map)) | 1283 | :type (cadr (assoc nntp-open-connection-function map)) |
| 1284 | :end-of-command "^\\([2345]\\|[.]\\).*\n" | 1284 | :end-of-command "^\\([2345]\\|[.]\\).*\n" |
| 1285 | :capability-command "CAPABILITIES\r\n" | 1285 | :capability-command "HELP\r\n" |
| 1286 | :success "^3" | 1286 | :success "^3" |
| 1287 | :starttls-function | 1287 | :starttls-function |
| 1288 | (lambda (capabilities) | 1288 | (lambda (capabilities) |