[Emacs-diffs] /srv/bzr/emacs/trunk r110443: Fix for url-https.el neing merged into url-http.el

[Glenn Morris]

------------------------------------------------------------
revno: 110443
fixes bug: http://debbugs.gnu.org/12599
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-10-08 00:47:23 -0700
message:
  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.
modified:
  lisp/url/ChangeLog
  lisp/url/url-methods.el

=== modified file 'lisp/url/ChangeLog'
--- a/lisp/url/ChangeLog        2012-10-02 03:48:01 +0000
+++ b/lisp/url/ChangeLog        2012-10-08 07:47:23 +0000
@@ -1,3 +1,8 @@
+2012-10-08  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * url-http.el (url-http-user-agent-string): Leak less info.

=== modified file 'lisp/url/url-methods.el'
--- a/lisp/url/url-methods.el   2012-09-17 05:41:04 +0000
+++ b/lisp/url/url-methods.el   2012-10-08 07:47:23 +0000
@@ -118,7 +118,9 @@
        (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