emacs: update git rev (#7897)

This commit is contained in:
augiedoggie
2023-03-03 00:05:19 -07:00
committed by GitHub
parent f0edcee535
commit ba52d90d25
2 changed files with 3 additions and 24 deletions

View File

@@ -13,13 +13,12 @@ news reader, debugger interface, calendar, and more.
HOMEPAGE="https://gnu.org/s/emacs/"
COPYRIGHT="2001-2022 Free Software Foundation, Inc."
LICENSE="GNU GPL v3"
REVISION="4"
srcGitRev="2550e8bb0b03ee1c2c7a17d56c9f578bbbf1a9da"
REVISION="5"
srcGitRev="9e105d483fa54c5f07a42b4c0fab40507f1fd9ec"
SOURCE_URI="https://github.com/emacs-mirror/emacs/archive/$srcGitRev.tar.gz"
SOURCE_DIR="emacs-$srcGitRev"
CHECKSUM_SHA256="dbd90dbda5237f73e3e64bedd010d0e2463206df9f89b357547e1336976efd15"
CHECKSUM_SHA256="3d8f2bf8dbf3b973d3773f33b33bc52ff2648b1f65c2547ca794b06620c911c9"
ADDITIONAL_FILES="emacs.rdef.in"
PATCHES="file-equality.patch"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"

View File

@@ -1,20 +0,0 @@
diff --git a/lisp/files.el b/lisp/files.el
index 0d24852358e..8f8af2c492f 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -6357,6 +6357,15 @@ file-equal-p
(let (f1-attr f2-attr)
(and (setq f1-attr (file-attributes (file-truename file1)))
(setq f2-attr (file-attributes (file-truename file2)))
+ ;; Haiku systems change the file's last access timestamp
+ ;; every time `stat' is called. Make sure to not compare
+ ;; the timestamps in that case.
+
+ (when (eq system-type 'haiku)
+ (ignore-errors
+ (setcar (nthcdr 4 f1-attr) nil)
+ (setcar (nthcdr 4 f2-attr) nil))
+ t)
(equal f1-attr f2-attr))))))
(defun file-in-directory-p (file dir)