Fix for url-https.el neing merged into url-http.el

* lisp/url/url-methods.el (url-scheme-get-property): url-https.el was
merged into url-http.el, so load the latter for https.

Fixes: debbugs:12599

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 01248a91cf20e7f6832e65151b7702ce2f67af5c..c7fc4fcbfe1caafbd32d841a04b3c433432cf820 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-08  Glenn Morris  <rgm@gnu.org>
+
+       * url-methods.el (url-scheme-get-property): url-https.el was
+       merged into url-http.el, so load the latter for https.  (Bug#12599)
+
 2012-10-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * url-http.el (url-http-user-agent-string): Leak less info.

diff --git a/lisp/url/url-methods.el b/lisp/url/url-methods.el
index 26fe72014f798ce17f0d338959aa1b7a1d1ebd48..3168d5aab3fe18f5ecb37eb1e71eae06228bc3db 100644 (file)
--- a/lisp/url/url-methods.el
+++ b/lisp/url/url-methods.el
@@ -118,7 +118,9 @@ it has not already been loaded."
        (let* ((stub (concat "url-" scheme))
               (loader (intern stub)))
          (condition-case ()
-             (require loader)
+             ;; url-https.el was merged into url-http because of 8+3
+             ;; filename limitations, so we have to do this dance.
+             (require (if (equal "https" scheme) 'url-http loader))
            (error nil))
          (if (fboundp loader)
              (progn