Mercurial > emacs
diff lisp/url/url-gw.el @ 90729:6588c6259dfb
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 545-562)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- erc-iswitchb: Temporarily enable iswitchb mode
* gnus--rel--5.10 (patch 172-176)
- Merge from emacs--devo--0
- Update from CVS
- Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-156
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sat, 16 Dec 2006 01:29:26 +0000 |
| parents | 34a1ff09106b |
| children | e3694f1cb928 17e0dd217877 |
line wrap: on
line diff
--- a/lisp/url/url-gw.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/url/url-gw.el Sat Dec 16 01:29:26 2006 +0000 @@ -104,7 +104,7 @@ :group 'url-gateway) (defcustom url-gateway-nslookup-program "nslookup" - "*If non-NIL then a string naming nslookup program." + "*If non-nil then a string naming nslookup program." :type '(choice (const :tag "None" :value nil) string) :group 'url-gateway) @@ -253,7 +253,7 @@ ;; Use non-blocking socket if we can. (make-network-process :name name :buffer buffer :host host :service service - :nowait + :nowait (featurep 'make-network-process '(:nowait t)))) (socks (socks-open-network-stream name buffer host service))