bug#60635: emacs-consult will run error when update guix.git

bug#60635: emacs-consult will run error when update guix.git

[Feng Shu]

emacs -q and (require 'consult) will show:
Error running timer ‘show-paren-function’: (wrong-type-argument listp special-mode) [8 times]

-- 

bug#60635: Update emacs-compat and magit

[Feng Shu]

[-- Attachment #1: Type: text/plain, Size: 152 bytes --]


I think it is compat's problem, when I update compat to 29.1.1.0, the problem is
disapear

when I update compat, magit build fail, so update it too.



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-emacs-compat-Update-to-29.1.1.0.patch --]
[-- Type: text/x-patch, Size: 2568 bytes --]

From d00ac6d39bc5d1eae94710571715ebbeb202917a Mon Sep 17 00:00:00 2001
From: Feng Shu <tumashu@163.com>
Date: Sun, 8 Jan 2023 10:34:10 +0800
Subject: [PATCH 1/2] gnu: emacs-compat: Update to 29.1.1.0.

* gnu/packages/emacs-xyz.scm (emacs-compat): Update to 29.1.1.0.
---
 gnu/packages/emacs-xyz.scm | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 466fb65fd3..32801f370c 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -7794,24 +7794,21 @@ (define-public emacs-tup-mode
     (license license:gpl3+)))
 
 (define-public emacs-compat
-  (let ((commit "8a32564247ad3baee571252a2004c3d347962d01")) ;version bump
-    (package
-     (name "emacs-compat")
-     (version "29.1.0.1")
-     (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://git.sr.ht/~pkal/compat")
-                    (commit commit)))
-              (file-name (git-file-name name version))
+  (package
+    (name "emacs-compat")
+    (version "29.1.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://elpa.gnu.org/packages/"
+                                  "compat-" version ".tar"))
               (sha256
                (base32
-                "0wxv63cqrw7pd5vg5hwh48bf326766x6mzz1qw8shhkrycr43fks"))))
-     (build-system emacs-build-system)
-     (home-page "https://git.sr.ht/~pkal/compat")
-     (synopsis "Emacs Lisp Compatibility Library")
-     (description
-      "To allow for the usage of Emacs functions and macros that are defined
+                "0b371rilcbkjmb1fdaib7fnrngkm1q7xdmv15a3xvmpalvfwmrwc"))))
+    (build-system emacs-build-system)
+    (home-page "https://git.sr.ht/~pkal/compat")
+    (synopsis "Emacs Lisp Compatibility Library")
+    (description
+     "To allow for the usage of Emacs functions and macros that are defined
 in newer versions of Emacs, @code{compat.el} provides definitions that
 are installed ONLY if necessary.  These reimplementations of functions
 and macros are at least subsets of the actual implementations.  Be
@@ -7822,7 +7819,7 @@ (define-public emacs-compat
 implemented to a meaningful degree.  The main audience for this
 library are not regular users, but package maintainers.  Therefore
 commands and user options are usually not implemented here.")
-     (license license:gpl3+))))
+    (license license:gpl3+)))
 
 (define-public emacs-company
   (package
-- 
2.38.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-emacs-magit-Update-to-3.3.0-0.b908c79.patch --]
[-- Type: text/x-patch, Size: 1237 bytes --]

From dc6fff7f3a595165de76bfb61095123e7444a951 Mon Sep 17 00:00:00 2001
From: Feng Shu <tumashu@163.com>
Date: Sun, 8 Jan 2023 10:45:13 +0800
Subject: [PATCH 2/2] gnu: emacs-magit: Update to 3.3.0-0.b908c79.

* gnu/packages/emacs-xyz.scm (emacs-magit): Update to 3.3.0-0.b908c79.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 32801f370c..808c751303 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -1160,7 +1160,7 @@ (define-public emacs-libgit
       (license license:gpl3+))))
 
 (define-public emacs-magit
-  (let ((commit "36059e0b881cb1465cb5ad0099e55e00845a8222")
+  (let ((commit "b908c79b44f5c282eec44f19fc1d9967f041dd5c")
         (revision "0"))
     (package
       (name "emacs-magit")
@@ -1173,7 +1173,7 @@ (define-public emacs-magit
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "12r5z7jbqh74rb9763smh4sblswzwi41wybzcvsy0zhw2r8lpmzv"))))
+          (base32 "1wybli5xrxkn8b7d7nm7h44avip9pjc24ig73hh15xg2wjm90zzc"))))
       (build-system emacs-build-system)
       (arguments
        (list
-- 
2.38.1


[-- Attachment #4: Type: text/plain, Size: 7 bytes --]




-- 

bug#60635: Update emacs-compat and magit

[Nicolas Goaziou]

Feng Shu <tumashu@163.com> writes:

> I think it is compat's problem, when I update compat to 29.1.1.0, the problem is
> disapear
>
> when I update compat, magit build fail, so update it too.

OK. I applied the patches. Thank you.

>  (define-public emacs-magit
> -  (let ((commit "36059e0b881cb1465cb5ad0099e55e00845a8222")
> +  (let ((commit "b908c79b44f5c282eec44f19fc1d9967f041dd5c")
>          (revision "0"))

NB: I also bumped revision.

Regards,
-- 
Nicolas Goaziou