HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-24; up to 2014-05-08T03:34:20Z!rgm@gnu.org
[bpt/emacs.git]
/
lisp
/
url
/
url-methods.el
diff --git
a/lisp/url/url-methods.el
b/lisp/url/url-methods.el
index
3b86ed4
..
84294ab
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
;;; url-methods.el --- Load URL schemes as needed
-;; Copyright (C) 1996-1999, 2004-201
1
Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2004-201
4
Free Software Foundation, Inc.
;; Keywords: comm, data, processes, hypermedia
;; Keywords: comm, data, processes, hypermedia
@@
-23,9
+23,6
@@
;;; Code:
;;; 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)
;; 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)
@@
-62,7
+59,7
@@
(defun url-scheme-default-loader (url &optional callback cbargs)
"Signal an error for an unknown URL scheme."
(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 "Unk
n
own URL scheme: %s" (url-type url)))
(defvar url-scheme--registering-proxy nil)
(defvar url-scheme--registering-proxy nil)
@@
-82,7
+79,7
@@
;; Store any proxying information - this will not overwrite an old
;; entry, so that people can still set this information in their
;; 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
(cond
(cur-proxy nil) ; Keep their old settings
((null env-proxy) nil) ; No proxy setup
@@
-121,7
+118,9
@@
it has not already been loaded."
(let* ((stub (concat "url-" scheme))
(loader (intern stub)))
(condition-case ()
(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
(error nil))
(if (fboundp loader)
(progn
@@
-134,17
+133,17
@@
it has not already been loaded."
(let ((symbol (intern-soft (format "%s-%s" stub (car cell))))
(type (cdr cell)))
(if symbol
(let ((symbol (intern-soft (format "%s-%s" stub (car cell))))
(type (cdr cell)))
(if symbol
- (case type
- (function
+ (
p
case type
+ (
`
function
;; Store the symbol name of a function
(if (fboundp symbol)
(setq desc (plist-put desc (car cell) symbol))))
;; 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)))))
;; 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)))))
(error "Malformed url-scheme-methods entry: %S"
cell))))))
(puthash scheme desc url-scheme-registry)))))