Update copyright year to 2015

[gnu-emacs] / lisp / url / url-methods.el

diff --git a/lisp/url/url-methods.el b/lisp/url/url-methods.el
index bd7d8e33922ec7f23b4f83e67568f6a9ef99b13b..a4f711b7004bafc223ad3f8e4eb42a3007ddf110 100644 (file)
--- a/lisp/url/url-methods.el
+++ b/lisp/url/url-methods.el
@@ -1,6 +1,6 @@
 ;;; url-methods.el --- Load URL schemes as needed
 
-;; Copyright (C) 1996-1999, 2004-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2004-2015 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
@@ -79,7 +79,7 @@
 
     ;; Store any proxying information - this will not overwrite an old
     ;; entry, so that people can still set this information in their
-    ;; .emacs file
+    ;; init file
     (cond
      (cur-proxy nil)                   ; Keep their old settings
      ((null env-proxy) nil)            ; No proxy setup
@@ -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