Merge from mainline.

2 files changed, 36 insertions, 23 deletions

diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el
index 094f3ad9bb3..860ad5c77d8 100644
--- a/lisp/eshell/em-ls.el
+++ b/lisp/eshell/em-ls.el
@@ -225,18 +225,28 @@ really need to stick around for very long."
       (eq (aref (nth 8 attrs) 0) type)))
 
 (defmacro eshell-ls-applicable (attrs index func file)
-  "Test whether, for ATTRS, the user UID can do what corresponds to INDEX.
-This is really just for efficiency, to avoid having to stat the file
-yet again."
-  `(if (numberp (nth 2 ,attrs))
-       (if (= (user-uid) (nth 2 ,attrs))
-           (not (eq (aref (nth 8 ,attrs) ,index) ?-))
-         (,(eval func) ,file))
-     (not (eq (aref (nth 8 ,attrs)
-                    (+ ,index (if (member (nth 2 ,attrs)
-                                          (eshell-current-ange-uids))
-                                  0 6)))
-              ?-))))
+  "Test whether, for ATTRS, the user can do what corresponds to INDEX.
+ATTRS is a string of file modes.  See `file-attributes'.
+If we cannot determine the answer using ATTRS (e.g., if we need
+to know what group the user is in), compute the return value by
+calling FUNC with FILE as an argument."
+  `(let ((owner (nth 2 ,attrs))
+         (modes (nth 8 ,attrs)))
+     (cond ((cond ((numberp owner)
+                   (= owner (user-uid)))
+                  ((stringp owner)
+                   (or (string-equal owner (user-login-name))
+                       (member owner (eshell-current-ange-uids)))))
+            ;; The user owns this file.
+            (not (eq (aref modes ,index) ?-)))
+           ((eq (aref modes (+ ,index 3))
+                (aref modes (+ ,index 6)))
+            ;; If the "group" and "other" fields give identical
+            ;; results, use that.
+            (not (eq (aref modes (+ ,index 3)) ?-)))
+           (t
+            ;; Otherwise call FUNC.
+            (,(eval func) ,file)))))
 
 (defcustom eshell-ls-highlight-alist nil
   "*This alist correlates test functions to color.
@@ -393,13 +403,13 @@ Sort entries alphabetically across.")
                (eshell-glob-regexp ignore-pattern))))
      ;; list the files!
      (eshell-ls-entries
-      (mapcar (function
-               (lambda (arg)
-                 (cons (if (and (eshell-under-windows-p)
-                                (file-name-absolute-p arg))
-                           (expand-file-name arg)
-                         arg)
-                       (eshell-file-attributes arg))))
+      (mapcar (lambda (arg)
+                (cons (if (and (eshell-under-windows-p)
+                               (file-name-absolute-p arg))
+                          (expand-file-name arg)
+                        arg)
+                      (eshell-file-attributes
+                       arg (if numeric-uid-gid 'integer 'string))))
               args)
       t (expand-file-name default-directory)))
    (funcall flush-func)))
@@ -710,7 +720,7 @@ Each member of FILES is either a string or a cons cell of the form
             (funcall insert-func need-return "\n"))))))
 
 (defun eshell-ls-entries (entries &optional separate root-dir)
-  "Output PATH's directory ENTRIES, formatted according to OPTIONS.
+  "Output PATH's directory ENTRIES.
 Each member of ENTRIES may either be a string or a cons cell, the car
 of which is the file name, and the cdr of which is the list of
 attributes.
diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index 7c21e2e3302..1a4c5e1021b 100644
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -701,8 +701,11 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable.
         (forward-line)))
     entry))
 
-(defun eshell-file-attributes (file)
-  "Return the attributes of FILE, playing tricks if it's over ange-ftp."
+(defun eshell-file-attributes (file &optional id-format)
+  "Return the attributes of FILE, playing tricks if it's over ange-ftp.
+The optional argument ID-FORMAT specifies the preferred uid and
+gid format.  Valid values are 'string and 'integer, defaulting to
+'integer.  See `file-attributes'."
   (let* ((file (expand-file-name file))
          entry)
     (if (string-equal (file-remote-p file 'method) "ftp")
@@ -723,7 +726,7 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable.
                       (setq entry (cdr fentry))
                     (setq entry nil)))))
           entry)
-      (file-attributes file))))
+      (file-attributes file id-format))))
 
 (defalias 'eshell-copy-tree 'copy-tree)