(rmail-summary-mode-map): Remove unneeded declaration.

[bpt/emacs.git] / lisp / url / url-nfs.el

diff --git a/lisp/url/url-nfs.el b/lisp/url/url-nfs.el
index a7ea476..efc4bcc 100644 (file)
--- a/lisp/url/url-nfs.el
+++ b/lisp/url/url-nfs.el
@@ -1,30 +1,28 @@
 ;;; url-nfs.el --- NFS URL interface
-;; Author: $Author: monnier $
-;; Created: $Date: 2004/04/04 01:21:46 $
-;; Version: $Revision: 1.1.1.1 $
+
+;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
+;;   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
 ;; Keywords: comm, data, processes
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Copyright (c) 1996 by William M. Perry <wmperry@cs.indiana.edu>
-;;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc.
-;;;
-;;; This file is part of GNU Emacs.
-;;;
-;;; GNU Emacs is free software; you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 2, or (at your option)
-;;; any later version.
-;;;
-;;; GNU Emacs is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;;; Boston, MA 02111-1307, USA.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; This file is part of GNU Emacs.
+;;
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
 
 (eval-when-compile (require 'cl))
 (require 'url-parse)
@@ -63,7 +61,7 @@ Each can be used any number of times.")
 
 (defun url-nfs-build-filename (url)
   (let* ((host (url-host url))
-        (port (string-to-int (url-port url)))
+        (port (url-port url))
         (pass (url-password url))
         (user (url-user url))
         (file (url-filename url)))
@@ -75,25 +73,22 @@ Each can be used any number of times.")
   (url-file (url-nfs-build-filename url) callback cbargs))
 
 (defmacro url-nfs-create-wrapper (method args)
-  (` (defun (, (intern (format "url-nfs-%s" method))) (, args)
-       (, (format "NFS URL wrapper around `%s' call." method))
-       (setq url (url-nfs-build-filename url))
-       (and url ((, (intern (format "url-file-%s" method)))
-                (,@ (remove '&rest (remove '&optional args))))))))
+  `(defun ,(intern (format "url-nfs-%s" method)) ,args
+     ,(format "NFS URL wrapper around `%s' call." method)
+     (setq url (url-nfs-build-filename url))
+     (and url (,(intern (format "url-file-%s" method))
+              ,@(remove '&rest (remove '&optional args))))))
 
 (url-nfs-create-wrapper file-exists-p (url))
-(url-nfs-create-wrapper file-attributes (url))
+(url-nfs-create-wrapper file-attributes (url &optional id-format))
 (url-nfs-create-wrapper file-symlink-p (url))
 (url-nfs-create-wrapper file-readable-p (url))
 (url-nfs-create-wrapper file-writable-p (url))
 (url-nfs-create-wrapper file-executable-p (url))
-(if (featurep 'xemacs)
-    (progn
-      (url-nfs-create-wrapper directory-files (url &optional full match nosort files-only))
-      (url-nfs-create-wrapper file-truename (url &optional default)))
-  (url-nfs-create-wrapper directory-files (url &optional full match nosort))
-  (url-nfs-create-wrapper file-truename (url &optional counter prev-dirs)))
+(url-nfs-create-wrapper directory-files (url &optional full match nosort))
+(url-nfs-create-wrapper file-truename (url &optional counter prev-dirs))
 
 (provide 'url-nfs)
 
-;;; arch-tag: cdf9c9ba-b7d2-4c29-8b48-7ae9bbc0d437
+;; arch-tag: cdf9c9ba-b7d2-4c29-8b48-7ae9bbc0d437
+;;; url-nfs.el ends here