From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 31 Aug 2019 06:54:05 +0000 (+0300)
Subject: Avoid signaling errors from ls-lisp--insert-directory on macOS
X-Git-Tag: emacs-27.0.90~1328^2~32
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=616835312e950fdeb38e8d7cbfcc6f581866ae36;p=emacs.git

Avoid signaling errors from ls-lisp--insert-directory on macOS

* lisp/ls-lisp.el (ls-lisp-sanitize): Don't assume the
directory entries for ".." and "." will either both be present
or both absent.  (Bug#37236)
---

diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index e802c2408f7..8491181bbe1 100644
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -517,7 +517,8 @@ If the \"..\" directory entry has nil attributes, the attributes
 are copied from the \".\" entry, if they are non-nil.  Otherwise,
 the offending element is removed from the list, as are any
 elements for other directory entries with nil attributes."
-  (if (and (null (cdr (assoc ".." file-alist)))
+  (if (and (consp (assoc ".." file-alist))
+           (null (cdr (assoc ".." file-alist)))
 	   (cdr (assoc "." file-alist)))
       (setcdr (assoc ".." file-alist) (cdr (assoc "." file-alist))))
   (rassq-delete-all nil file-alist))