auto upstream

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 @@
+2012-12-27  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * nntp.el (nntp-open-connection): Use HELP as the capability command
+        instead of CAPABILITY because Typhoon v2.2.2.503 chokes completely on
+        unknown commands.  And CAPABILITY is an unknown command (bug#12763).
+
 2012-12-27  Wolfgang Jenkner  <wjenkner@inode.at>
 
         * 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
                      "nntpd" pbuffer nntp-address nntp-port-number
                      :type (cadr (assoc nntp-open-connection-function map))
                      :end-of-command "^\\([2345]\\|[.]\\).*\n"
-                     :capability-command "CAPABILITIES\r\n"
+                     :capability-command "HELP\r\n"
                      :success "^3"
                      :starttls-function
                      (lambda (capabilities)