changeset 102677:d2c2e1206e31

(directory-files-and-attributes): Accept and ignore additional optional argument id-format. (eshell-directory-files-and-attributes): Call directory-files-and-attributes with additional argument id-format.
author Eli Zaretskii <eliz@gnu.org>
date Sat, 21 Mar 2009 14:00:26 +0000
parents 100b06d58ef9
children 985635bb2d2c
files lisp/eshell/esh-util.el
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/eshell/esh-util.el	Sat Mar 21 13:01:44 2009 +0000
+++ b/lisp/eshell/esh-util.el	Sat Mar 21 14:00:26 2009 +0000
@@ -579,7 +579,7 @@
 	string)))
 
 (unless (fboundp 'directory-files-and-attributes)
-  (defun directory-files-and-attributes (directory &optional full match nosort)
+  (defun directory-files-and-attributes (directory &optional full match nosort id-format)
     "Return a list of names of files and their attributes in DIRECTORY.
 There are three optional arguments:
 If FULL is non-nil, return absolute file names.  Otherwise return names
@@ -596,12 +596,12 @@
 
 (defvar ange-cache)
 
-(defun eshell-directory-files-and-attributes (dir &optional full match nosort)
+(defun eshell-directory-files-and-attributes (dir &optional full match nosort id-format)
   "Make sure to use the handler for `directory-file-and-attributes'."
   (let* ((dir (expand-file-name dir))
 	 (dfh (find-file-name-handler dir 'directory-files)))
     (if (not dfh)
-	(directory-files-and-attributes dir full match nosort)
+	(directory-files-and-attributes dir full match nosort id-format)
       (let ((files (funcall dfh 'directory-files dir full match nosort))
 	    (fah (find-file-name-handler dir 'file-attributes)))
 	(mapcar