emacs-elpa-diffs
[Top][All Lists]
Advanced

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

[nongnu] elpa/magit 108ed15749: Use new compat-call macro


From: Jonas Bernoulli
Subject: [nongnu] elpa/magit 108ed15749: Use new compat-call macro
Date: Thu, 5 Jan 2023 12:30:44 -0500 (EST)

branch: elpa/magit
commit 108ed1574953b7c388dc75694bcd6d36acb025ca
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>

    Use new compat-call macro
    
    Bump version/snapshot to make sure we get a Compat version
    that includes the new macro.  This had to be done manually
    as the bump-snapshots make target suffers from bit rot.
    
    Closes #4836.
---
 .github/workflows/test.yml | 2 +-
 default.mk                 | 4 ++--
 lisp/magit-autorevert.el   | 2 +-
 lisp/magit-extras.el       | 8 ++++----
 lisp/magit-git.el          | 4 ++--
 lisp/magit-mode.el         | 2 +-
 lisp/magit-pkg.el          | 2 +-
 lisp/magit-section.el      | 7 ++++---
 lisp/magit.el              | 2 +-
 9 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 44ff2563d6..d144d78d13 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -29,7 +29,7 @@ jobs:
     - name: Checkout compat
       uses: actions/checkout@v2
       with:
-        repository: emacsmirror/compat
+        repository: emacs-compat/compat
         path: compat
     - name: Checkout dash
       uses: actions/checkout@v2
diff --git a/default.mk b/default.mk
index 65ccaf19f5..7ac73b9b84 100644
--- a/default.mk
+++ b/default.mk
@@ -113,7 +113,7 @@ VERSION ?= $(shell \
   git describe --tags --abbrev=0 --always | cut -c2-)
 TIMESTAMP = 20211004
 
-COMPAT_VERSION        = 28.1.0.4
+COMPAT_VERSION        = 29.1.0.0
 DASH_VERSION          = 2.19.1
 GIT_COMMIT_VERSION    = $(VERSION)
 LIBGIT_VERSION        = 0
@@ -123,7 +123,7 @@ MAGIT_SECTION_VERSION = $(VERSION)
 TRANSIENT_VERSION     = 0.3.6
 WITH_EDITOR_VERSION   = 3.0.5
 
-COMPAT_SNAPSHOT              = 28.1.0.4
+COMPAT_SNAPSHOT              = 29.1.0.0snapshot0.20230105.94704
 DASH_MELPA_SNAPSHOT          = 20210826
 GIT_COMMIT_MELPA_SNAPSHOT    = $(TIMESTAMP)
 LIBGIT_MELPA_SNAPSHOT        = 0
diff --git a/lisp/magit-autorevert.el b/lisp/magit-autorevert.el
index a1ca00039d..744bcd29d6 100644
--- a/lisp/magit-autorevert.el
+++ b/lisp/magit-autorevert.el
@@ -106,7 +106,7 @@ seconds of user inactivity.  That is not desirable."
                (not global-auto-revert-mode) ; see #3460
                buffer-file-name
                (file-readable-p buffer-file-name)
-               (compat-executable-find (magit-git-executable) t)
+               (compat-call executable-find (magit-git-executable) t)
                (magit-toplevel)
                (or (not magit-auto-revert-tracked-only)
                    (magit-file-tracked-p buffer-file-name)))
diff --git a/lisp/magit-extras.el b/lisp/magit-extras.el
index 6c083ddc9a..b34cdab5cf 100644
--- a/lisp/magit-extras.el
+++ b/lisp/magit-extras.el
@@ -263,9 +263,9 @@ is no file at point, then instead visit 
`default-directory'."
   (interactive "P")
   (if-let ((topdir (magit-toplevel default-directory)))
       (let ((args (car (magit-log-arguments)))
-            (files (compat-dired-get-marked-files
-                    nil nil #'magit-file-tracked-p nil
-                    "No marked file is being tracked by Git")))
+            (files (compat-call dired-get-marked-files
+                                nil nil #'magit-file-tracked-p nil
+                                "No marked file is being tracked by Git")))
         (when (and follow
                    (not (member "--follow" args))
                    (not (cdr files)))
@@ -286,7 +286,7 @@ for a repository."
   (interactive (list (or (magit-toplevel)
                          (magit-read-repository t))
                      current-prefix-arg))
-  (let ((files (compat-dired-get-marked-files nil arg nil nil t)))
+  (let ((files (compat-call dired-get-marked-files nil arg nil nil t)))
     (magit-status-setup-buffer repo)
     (magit-am-apply-patches files)))
 
diff --git a/lisp/magit-git.el b/lisp/magit-git.el
index 141ca8557b..d5677a379d 100644
--- a/lisp/magit-git.el
+++ b/lisp/magit-git.el
@@ -593,7 +593,7 @@ executable."
                               (error "`git --exec-path' failed"))))
                    exec-suffixes
                    #'file-executable-p)
-      (compat-executable-find command t)))
+      (compat-call executable-find command t)))
 
 ;;; Git Version
 
@@ -946,7 +946,7 @@ returning the truename."
   "Git executable cannot be found (see https://magit.vc/goto/e6a78ed2)")
 
 (defun magit--assert-usable-git ()
-  (if (not (compat-executable-find (magit-git-executable) t))
+  (if (not (compat-call executable-find (magit-git-executable) t))
       (signal 'magit-git-executable-not-found (magit-git-executable))
     (let ((magit-git-debug
            (lambda (err)
diff --git a/lisp/magit-mode.el b/lisp/magit-mode.el
index 0761b5e66c..3381a78978 100644
--- a/lisp/magit-mode.el
+++ b/lisp/magit-mode.el
@@ -1371,7 +1371,7 @@ Unless specified, REPOSITORY is the current buffer's 
repository."
   (when-let ((cache (assoc (or repository
                                (magit-repository-local-repository))
                            magit-repository-local-cache)))
-    (setf cache (compat-assoc-delete-all key cache))))
+    (setf cache (compat-call assoc-delete-all key cache))))
 
 (defmacro magit--with-repository-local-cache (key &rest body)
   (declare (indent 1) (debug (form body)))
diff --git a/lisp/magit-pkg.el b/lisp/magit-pkg.el
index a3d03ed640..34737a29b4 100644
--- a/lisp/magit-pkg.el
+++ b/lisp/magit-pkg.el
@@ -1,7 +1,7 @@
 (define-package "magit" "3.3.0.50-git"
   "A Git porcelain inside Emacs."
   '((emacs         "25.1")
-    (compat        "28.1.1.2")
+    (compat        "29.1.0.0snapshot0.20230105.94704")
     (dash          "20210826")
     (git-commit    "20221127")
     (magit-section "20221127")
diff --git a/lisp/magit-section.el b/lisp/magit-section.el
index 286d95193f..064063f72b 100644
--- a/lisp/magit-section.el
+++ b/lisp/magit-section.el
@@ -1776,9 +1776,10 @@ invisible."
 
 (cl-defun magit-section-cache-visibility
     (&optional (section magit-insert-section--current))
-  (setf (compat-alist-get (magit-section-ident section)
-                          magit-section-visibility-cache
-                          nil nil #'equal)
+  (setf (compat-call alist-get
+                     (magit-section-ident section)
+                     magit-section-visibility-cache
+                     nil nil #'equal)
         (if (oref section hidden) 'hide 'show)))
 
 (cl-defun magit-section-maybe-cache-visibility
diff --git a/lisp/magit.el b/lisp/magit.el
index 71b1487208..5d883b72bd 100644
--- a/lisp/magit.el
+++ b/lisp/magit.el
@@ -20,7 +20,7 @@
 ;; Package-Version: 3.3.0.50-git
 ;; Package-Requires: (
 ;;     (emacs "25.1")
-;;     (compat "28.1.1.2")
+;;     (compat "29.1.0.0")
 ;;     (dash "2.19.1")
 ;;     (git-commit "3.3.0")
 ;;     (magit-section "3.3.0")



reply via email to

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