(ls-lisp-delete-matching): List argument is now alist

of filenames and attributes.
(ls-lisp-insert-directory): Use directory-files-and-attributes
for speed.

diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index e02bd5db459c5caae003cdd16b3dbab4ff631973..6158eff5df97f6d6bdfbc2344f0681c48d50ada8 100644 (file)
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -134,29 +134,18 @@ are: A a c i r S s t u"
                 (sum 0)
                 elt
                 short
-                (file-list (directory-files dir nil wildcard))
-                file-alist 
+                (file-alist (directory-files-and-attributes dir nil wildcard))
                 (now (current-time))
                 ;; do all bindings here for speed
                 file-size
                 fil attr)
            (cond ((memq ?A switches)
-                  (setq file-list
-                        (ls-lisp-delete-matching "^\\.\\.?$" file-list)))
+                  (setq file-alist
+                        (ls-lisp-delete-matching "^\\.\\.?$" file-alist)))
                  ((not (memq ?a switches))
                   ;; if neither -A  nor -a, flush . files
-                  (setq file-list
-                        (ls-lisp-delete-matching "^\\." file-list))))
-           (setq file-alist
-                 (mapcar
-                  (function
-                   (lambda (x)
-                     ;; file-attributes("~bogus") bombs
-                     (cons x (file-attributes (expand-file-name x)))))
-                  ;; inserting the call to directory-files right here
-                  ;; seems to stimulate an Emacs bug
-                  ;; ILLEGAL DATATYPE (#o37777777727) or #o67
-                  file-list))
+                  (setq file-alist
+                        (ls-lisp-delete-matching "^\\." file-alist))))
            ;; ``Total'' line (filled in afterwards).
            (insert (if (car-safe file-alist)
                        "total \007\n"
@@ -201,7 +190,7 @@ are: A a c i r S s t u"
   ;; Should perhaps use setcdr for efficiency.
   (let (result)
     (while list
-      (or (string-match regexp (car list))
+      (or (string-match regexp (car (car list)))
          (setq result (cons (car list) result)))
       (setq list (cdr list)))
     result))