From 97fbed87597d0b1b93159095170fb296b307d6b0 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 8 Oct 2012 00:47:23 -0700 Subject: [PATCH 1/1] 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 --- lisp/url/ChangeLog | 5 +++++ lisp/url/url-methods.el | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 01248a91cf..c7fc4fcbfe 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,8 @@ +2012-10-08 Glenn Morris + + * 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 * 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 26fe72014f..3168d5aab3 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 -- 2.39.2