nntp.el (nntp-open-connection): Check if process-type is available.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 57acf0ced0e70bd516d9faf9ba79425723c5f785..1a55b7fb995996c4eb5d62e6cfb611617ea6799a 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * nntp.el (nntp-open-connection): Check if process-type is available.
+
 2011-05-16  Julien Danjou  <julien@danjou.info>
 
        * shr.el (shr-tag-del): Add support for del tag.

diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index aa4b9184dbba88ab1d8ea22392d1c7a06ebbb496..cdd12abbc061a72015eebfb8c7fd1f4a8d9ff07e 100644 (file)
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -1362,7 +1362,8 @@ password contained in '~/.nntp-authinfo'."
       (nntp-kill-buffer pbuffer))
     (when (and (buffer-name pbuffer)
               process)
-      (when (and (fboundp 'set-network-process-option)
+      (when (and (fboundp 'set-network-process-option) ;; Unavailable in XEmacs.
+                (fboundp 'process-type) ;; Emacs 22 doesn't provide it.
                  (eq (process-type process) 'network))
         ;; Use TCP-keepalive so that connections that pass through a NAT router
         ;; don't hang when left idle.