comparison lisp/url/url-nfs.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-nfs.el --- NFS URL interface 1 ;;; url-nfs.el --- NFS URL interface
2 ;; Author: $Author: fx $ 2 ;; Author: $Author: monnier $
3 ;; Created: $Date: 2001/05/22 16:10:50 $ 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) 1996 by William M. Perry <wmperry@cs.indiana.edu> 8 ;;; Copyright (c) 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.
93 (url-nfs-create-wrapper file-truename (url &optional default))) 93 (url-nfs-create-wrapper file-truename (url &optional default)))
94 (url-nfs-create-wrapper directory-files (url &optional full match nosort)) 94 (url-nfs-create-wrapper directory-files (url &optional full match nosort))
95 (url-nfs-create-wrapper file-truename (url &optional counter prev-dirs))) 95 (url-nfs-create-wrapper file-truename (url &optional counter prev-dirs)))
96 96
97 (provide 'url-nfs) 97 (provide 'url-nfs)
98
99 ;;; arch-tag: cdf9c9ba-b7d2-4c29-8b48-7ae9bbc0d437