masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-04 11:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* lisp/files.el (file-equal-p): Work around Haiku stat bug.

Browse source
This commit is contained in:
Po Lu 2023-02-18 11:03:07 +08:00
parent 13fd7667f9
commit 3e74763099
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lisp/files.el
View file

@ -6357,7 +6357,18 @@ If FILE1 or FILE2 does not exist, the return value is unspecified."
(let (f1-attr f2-attr) (let (f1-attr f2-attr)
(and (setq f1-attr (file-attributes (file-truename file1))) (and (setq f1-attr (file-attributes (file-truename file1)))
(setq f2-attr (file-attributes (file-truename file2))) (setq f2-attr (file-attributes (file-truename file2)))
(equal f1-attr f2-attr)))))) (progn
;; Haiku systems change the file's last access timestamp
;; every time `stat' is called. Make sure to not compare
;; the timestamps in that case.
(or (equal f1-attr f2-attr)
(when (and (eq system-type 'haiku)
(consp (nthcdr 4 f1-attr))
(consp (nthcdr 4 f2-attr)))
(ignore-errors
(setcar (nthcdr 4 f1-attr) nil)
(setcar (nthcdr 4 f2-attr) nil))
(equal f1-attr f2-attr)))))))))
(defun file-in-directory-p (file dir) (defun file-in-directory-p (file dir)
"Return non-nil if DIR is a parent directory of FILE. "Return non-nil if DIR is a parent directory of FILE.