guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#69510] [PATCH emacs-team 2/2] gnu: emacs-next-minimal: Update to 30


From: Liliana Marie Prikler
Subject: [bug#69510] [PATCH emacs-team 2/2] gnu: emacs-next-minimal: Update to 30.0.50-2.170c655.
Date: Sat, 2 Mar 2024 17:13:32 +0100

* gnu/packages/emacs.scm (emacs-next-minimal): Update to 30.0.50-2.170c655.
* gnu/packages/aux-files/emacs/comp-integrity.el: Adjust accordingly.
---
 gnu/packages/aux-files/emacs/comp-integrity.el | 5 ++++-
 gnu/packages/emacs.scm                         | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/aux-files/emacs/comp-integrity.el 
b/gnu/packages/aux-files/emacs/comp-integrity.el
index ed6a348fed..9692d9bf97 100644
--- a/gnu/packages/aux-files/emacs/comp-integrity.el
+++ b/gnu/packages/aux-files/emacs/comp-integrity.el
@@ -89,7 +89,10 @@
 (expect-native mouse-wheel-change-button)
 (expect-native advice-function-mapc)
 (expect-native comment-string-strip)
-(expect-native obarray-make)
+(if (>= emacs-major-version 30)
+    (expect-builtin obarray-make)
+    (expect-native obarray-make))
+(expect-native obarray-map)
 (expect-native oclosure-type)
 (expect-native forward-page)
 (expect-native sentence-end)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index e6f2b699ac..e89c6cff16 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -549,8 +549,8 @@ (define-public emacs-wide-int
         #~(cons "--with-wide-int" #$flags))))))
 
 (define-public emacs-next-minimal
-  (let ((commit "9d27b95b263473fb41a30e3f6ea5607c99e93a61")
-        (revision "1"))
+  (let ((commit "170c6557922dad7e6e9bc0d6dadf6c080108fd42")
+        (revision "2"))
    (package
     (inherit emacs-minimal)
     (name "emacs-next-minimal")
@@ -563,7 +563,7 @@ (define-public emacs-next-minimal
              (commit commit)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "00mwpq1msr3jij281w5piqmbwq968xr8dn9hqbf4r947ck754kn9"))
+        (base32 "04carva3b6h9fnlzazrsxsj41hcnjc26kxjij07l159azi40l6sk"))
        (patches
         (search-patches "emacs-next-exec-path.patch"
                         "emacs-fix-scheme-indent-function.patch"
-- 
2.41.0






reply via email to

[Prev in Thread] Current Thread [Next in Thread]