Mercurial > emacs
comparison lisp/url/url-https.el @ 54699:7784ae10206d
Resolve CVS conflicts
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 04 Apr 2004 04:44:10 +0000 |
parents | 3fb37923e567 |
children | e8824c4f5f7e 1029206e72f2 |
comparison
equal
deleted
inserted
replaced
54698:ee631551cb0a | 54699:7784ae10206d |
---|---|
1 ;;; url-https.el --- HTTP over SSL routines | 1 ;;; url-https.el --- HTTP over SSL routines |
2 ;; Author: $Author: wmperry $ | 2 ;; Author: $Author: monnier $ |
3 ;; Created: $Date: 2001/11/22 14:32:13 $ | 3 ;; Created: $Date: 2004/04/04 01:21:46 $ |
4 ;; Version: $Revision: 1.3 $ | 4 ;; Version: $Revision: 1.1.1.1 $ |
5 ;; Keywords: comm, data, processes | 5 ;; Keywords: comm, data, processes |
6 | 6 |
7 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 7 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
8 ;;; Copyright (c) 1999 Free Software Foundation, Inc. | 8 ;;; Copyright (c) 1999 Free Software Foundation, Inc. |
9 ;;; | 9 ;;; |
49 (url-https-create-secure-wrapper file-exists-p (url)) | 49 (url-https-create-secure-wrapper file-exists-p (url)) |
50 (url-https-create-secure-wrapper file-readable-p (url)) | 50 (url-https-create-secure-wrapper file-readable-p (url)) |
51 (url-https-create-secure-wrapper file-attributes (url)) | 51 (url-https-create-secure-wrapper file-attributes (url)) |
52 | 52 |
53 (provide 'url-https) | 53 (provide 'url-https) |
54 | |
55 ;;; arch-tag: c3645ac5-c248-4d12-ad41-7c4b6f7b6d19 |