Mercurial > emacs
comparison lisp/url/url-file.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-file.el --- File retrieval code | 1 ;;; url-file.el --- File retrieval code |
2 ;; Author: $Author: fx $ | 2 ;; Author: $Author: monnier $ |
3 ;; Created: $Date: 2002/04/22 09:14:24 $ | 3 ;; Created: $Date: 2004/04/04 01:21:46 $ |
4 ;; Version: $Revision: 1.11 $ | 4 ;; Version: $Revision: 1.1.1.1 $ |
5 ;; Keywords: comm, data, processes | 5 ;; Keywords: comm, data, processes |
6 | 6 |
7 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 7 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
8 ;;; Copyright (c) 1993 - 1996 by William M. Perry <wmperry@cs.indiana.edu> | 8 ;;; Copyright (c) 1993 - 1996 by William M. Perry <wmperry@cs.indiana.edu> |
9 ;;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc. | 9 ;;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc. |
235 (url-file-create-wrapper file-truename (url &optional default))) | 235 (url-file-create-wrapper file-truename (url &optional default))) |
236 (url-file-create-wrapper directory-files (url &optional full match nosort)) | 236 (url-file-create-wrapper directory-files (url &optional full match nosort)) |
237 (url-file-create-wrapper file-truename (url &optional counter prev-dirs))) | 237 (url-file-create-wrapper file-truename (url &optional counter prev-dirs))) |
238 | 238 |
239 (provide 'url-file) | 239 (provide 'url-file) |
240 | |
241 ;;; arch-tag: 010e914a-7313-494b-8a8c-6495a862157d |