From: Glenn Morris <rgm@gnu.org>
Date: Mon, 8 Oct 2012 07:47:23 +0000 (-0700)
Subject: Fix for url-https.el neing merged into url-http.el
X-Git-Tag: emacs-24.2.90~237^2~62
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=97fbed87597d0b1b93159095170fb296b307d6b0;p=emacs.git

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 01248a91cf2..c7fc4fcbfe1 100644
--- 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 26fe72014f7..3168d5aab3f 100644
--- 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