[Emacs-diffs] nsm 01/01: * url-http.el (url-http): Protect against `url-http-noninteractive' being unbound.

[Lars Ingebrigtsen]

branch: nsm
commit 06433ea7e095d744249b30d3db9a2f768f729a45
Author: Lars Magne Ingebrigtsen <address@hidden>
Date:   Wed Nov 19 16:44:03 2014 +0100

    * url-http.el (url-http): Protect against `url-http-noninteractive' being 
unbound.
---
 lisp/url/ChangeLog   |    3 +++
 lisp/url/url-http.el |    3 ++-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index b4758f7..33290f4 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,5 +1,8 @@
 2014-11-19  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * url-http.el (url-http): Protect against
+       `url-http-noninteractive' being unbound.
+
        * url-queue.el (url-queue-start-retrieve): Mark all we do as
        noninteractive.
 
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index e37ab3f..28d8c65 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -1183,7 +1183,8 @@ previous `url-http' call, which is being re-attempted."
   (let* ((host (url-host (or url-using-proxy url)))
         (port (url-port (or url-using-proxy url)))
         (nsm-noninteractive (or url-request-noninteractive
-                                url-http-noninteractive))
+                                (and (boundp 'url-http-noninteractive)
+                                     url-http-noninteractive)))
         (connection (url-http-find-free-connection host port))
         (buffer (or retry-buffer
                     (generate-new-buffer