[Emacs-diffs] emacs/lisp/eshell esh-util.el

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    09/03/21 14:00:29

Modified files:
        lisp/eshell    : esh-util.el 

Log message:
        (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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/eshell/esh-util.el?cvsroot=emacs&r1=1.37&r2=1.38

Patches:
Index: esh-util.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/eshell/esh-util.el,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- esh-util.el 24 Feb 2009 03:30:46 -0000      1.37
+++ esh-util.el 21 Mar 2009 14:00:26 -0000      1.38
@@ -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