From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 21 Mar 2009 14:00:26 +0000 (+0000)
Subject: (directory-files-and-attributes): Accept and ignore additional optional
X-Git-Tag: emacs-pretest-23.0.92~108
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8e9b25831feecd9b0732a5c10f6b1ad56d6b5d4e;p=emacs.git

(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.
---

diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index 60e5fe7ab9a..4c5ecb4617a 100644
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -579,7 +579,7 @@ Unless optional argument INPLACE is non-nil, return a new string."
 	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 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable.
 
 (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