X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/06d8ace51597cd41e110560a56a1abeb6cce23d6..7e09ef09a479731d01b1ca46e94ddadd73ac98e3:/lisp/url/url-methods.el

diff --git a/lisp/url/url-methods.el b/lisp/url/url-methods.el
index e7da5254f8..a4f711b700 100644
--- a/lisp/url/url-methods.el
+++ b/lisp/url/url-methods.el
@@ -1,7 +1,6 @@
 ;;; url-methods.el --- Load URL schemes as needed
 
-;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2004-2015 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
@@ -24,9 +23,6 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cl))
-
 ;; This loads up some of the small, silly URLs that I really don't
 ;; want to bother putting in their own separate files.
 (require 'url-parse)
@@ -63,7 +59,7 @@
 
 (defun url-scheme-default-loader (url &optional callback cbargs)
   "Signal an error for an unknown URL scheme."
-  (error "Unkown URL scheme: %s" (url-type url)))
+  (error "Unknown URL scheme: %s" (url-type url)))
 
 (defvar url-scheme--registering-proxy nil)
 
@@ -83,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
@@ -122,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
@@ -135,17 +133,17 @@ it has not already been loaded."
 		  (let ((symbol (intern-soft (format "%s-%s" stub (car cell))))
 			(type (cdr cell)))
 		    (if symbol
-			(case type
-			  (function
+			(pcase type
+			  (`function
 			   ;; Store the symbol name of a function
 			   (if (fboundp symbol)
 			       (setq desc (plist-put desc (car cell) symbol))))
-			  (variable
+			  (`variable
 			   ;; Store the VALUE of a variable
 			   (if (boundp symbol)
 			       (setq desc (plist-put desc (car cell)
 						     (symbol-value symbol)))))
-			  (otherwise
+			  (_
 			   (error "Malformed url-scheme-methods entry: %S"
 				  cell))))))
 		(puthash scheme desc url-scheme-registry)))))