procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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
This commit is contained in:
Glenn Morris 2012-10-08 00:47:23 -07:00
parent 63820c5c02
commit 97fbed8759
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/url/ChangeLog
View file

@ -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.

4
lisp/url/url-methods.el
View file

@ -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