mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-23 10:34:07 +00:00
Code Issues Releases Activity

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

Browse Source 
* 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)
This commit is contained in:
Eli Zaretskii 2019-08-31 09:54:05 +03:00
parent 4a919b1bbc
commit 616835312e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/ls-lisp.el
View File

@ -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))