(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 60e5fe7ab9a1d69df5c22ce11a12430022a25af1..4c5ecb4617ae4d2c99f3f79920d45c4e974c49b5 100644 (file)
--- 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