diff options
| author | Katsumi Yamaoka <yamaoka@jpl.org> | 2011-05-16 14:46:30 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2011-05-16 14:46:30 +0000 |
| commit | 7887e229fd0da2b55cc927bf1ad80dacae8e81b1 (patch) | |
| tree | 65f81335c4a4db4dfc741f09190353733d3cce13 /lisp | |
| parent | c0ad01c90c6661bfc3b744d10eb70e438dedadff (diff) | |
| download | emacs-7887e229fd0da2b55cc927bf1ad80dacae8e81b1.tar.gz | |
nntp.el (nntp-open-connection): Check if process-type is available.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/gnus/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/gnus/nntp.el | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 57acf0ced0e..1a55b7fb995 100644 --- 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 aa4b9184dbb..cdd12abbc06 100644 --- 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. |