From 616835312e950fdeb38e8d7cbfcc6f581866ae36 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 31 Aug 2019 09:54:05 +0300 Subject: [PATCH] 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) --- lisp/ls-lisp.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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)) -- 2.39.2