diff options
| author | Karoly Lorentey | 2004-04-13 17:17:13 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2004-04-13 17:17:13 +0000 |
| commit | 6917311031ecaa452d591f99d3bba4e3ce1ec050 (patch) | |
| tree | e057ac34cab81d493581606485ccbdf3a9442ef4 /lisp/url/url-https.el | |
| parent | 67ad74dfc55fafe210e8bf1dcae80d269d38ea4b (diff) | |
| parent | a2de0c3b755f982b426e915e3d1064a10f6206bb (diff) | |
| download | emacs-6917311031ecaa452d591f99d3bba4e3ce1ec050.tar.gz emacs-6917311031ecaa452d591f99d3bba4e3ce1ec050.zip | |
Merged in changes from CVS trunk
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-200
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-201
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-202
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-203
Add entry for macroexpand-all to NEWS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-204
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-205
Add macroexpand-all to lisp reference manual
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-206
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-207
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-208
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-209
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-210
More RCS keyword removal
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-211
File-permission tweaks
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-212
Checkout from CVS with unexpanded RCS keywords
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-136
Diffstat (limited to 'lisp/url/url-https.el')
| -rw-r--r-- | lisp/url/url-https.el | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/url/url-https.el b/lisp/url/url-https.el index 9754cd1b976..0ea11a45b79 100644 --- a/lisp/url/url-https.el +++ b/lisp/url/url-https.el | |||
| @@ -33,14 +33,14 @@ | |||
| 33 | (defalias 'url-https-expand-file-name 'url-http-expand-file-name) | 33 | (defalias 'url-https-expand-file-name 'url-http-expand-file-name) |
| 34 | 34 | ||
| 35 | (defmacro url-https-create-secure-wrapper (method args) | 35 | (defmacro url-https-create-secure-wrapper (method args) |
| 36 | (` (defun (, (intern (format (if method "url-https-%s" "url-https") method))) (, args) | 36 | `(defun ,(intern (format (if method "url-https-%s" "url-https") method)) ,args |
| 37 | (, (format "HTTPS wrapper around `%s' call." (or method "url-http"))) | 37 | ,(format "HTTPS wrapper around `%s' call." (or method "url-http")) |
| 38 | (condition-case () | 38 | (condition-case () |
| 39 | (require 'ssl) | 39 | (require 'ssl) |
| 40 | (error | 40 | (error |
| 41 | (error "HTTPS support could not find `ssl' library."))) | 41 | (error "HTTPS support could not find `ssl' library"))) |
| 42 | (let ((url-gateway-method 'ssl)) | 42 | (let ((url-gateway-method 'ssl)) |
| 43 | ((, (intern (format (if method "url-http-%s" "url-http") method))) (,@ (remove '&rest (remove '&optional args)))))))) | 43 | ( ,(intern (format (if method "url-http-%s" "url-http") method)) ,@(remove '&rest (remove '&optional args)))))) |
| 44 | 44 | ||
| 45 | (url-https-create-secure-wrapper nil (url callback cbargs)) | 45 | (url-https-create-secure-wrapper nil (url callback cbargs)) |
| 46 | (url-https-create-secure-wrapper file-exists-p (url)) | 46 | (url-https-create-secure-wrapper file-exists-p (url)) |