[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/git-commit e766c891fe 03/26: Limit a workaround to the Ema
|
From: |
ELPA Syncer |
|
Subject: |
[nongnu] elpa/git-commit e766c891fe 03/26: Limit a workaround to the Emacs versions that need it |
|
Date: |
Fri, 22 Apr 2022 18:58:13 -0400 (EDT) |
branch: elpa/git-commit
commit e766c891fe6a279be9fe75ffe7d109e4b0684855
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>
Limit a workaround to the Emacs versions that need it
When this kludge was added Emacs 25.1 was still under development
and it was not clear when the bug would be fixed. Now we know; it
was fixed in Emacs 27.1.
---
lisp/magit-base.el | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lisp/magit-base.el b/lisp/magit-base.el
index 6add5a0564..d093acb914 100644
--- a/lisp/magit-base.el
+++ b/lisp/magit-base.el
@@ -1036,7 +1036,9 @@ and https://github.com/magit/magit/issues/2295.";
(and (file-directory-p filename)
(file-accessible-directory-p filename)))
-(when (magit--version>= emacs-version "25.1")
+(when (< emacs-major-version 27)
+ ;; Work around https://debbugs.gnu.org/cgi/bugreport.cgi?bug=21559.
+ ;; Fixed by cb55ccae8be946f1562d74718086a4c8c8308ee5 in Emacs 27.1.
(with-eval-after-load 'vc-git
(defun vc-git-conflicted-files (directory)
"Return the list of files with conflicts in DIRECTORY."
- [nongnu] elpa/git-commit updated (3cfc8458e1 -> 40fb3d2002), ELPA Syncer, 2022/04/22
- [nongnu] elpa/git-commit 58ce563589 04/26: magit-format-rev-summary: Cosmetics, ELPA Syncer, 2022/04/22
- [nongnu] elpa/git-commit 571b4346c1 05/26: Depend on the compat package from GNU Elpa, ELPA Syncer, 2022/04/22
- [nongnu] elpa/git-commit e766c891fe 03/26: Limit a workaround to the Emacs versions that need it,
ELPA Syncer <=
- [nongnu] elpa/git-commit 6cd8bcaf18 01/26: Use string-prefix-p and string-suffix-p, ELPA Syncer, 2022/04/22
- [nongnu] elpa/git-commit 485b265dd3 02/26: magit-generate-changelog: Minor error message tweak, ELPA Syncer, 2022/04/22
- [nongnu] elpa/git-commit 7671e46a8b 07/26: Use string-search instead of string-match-p, ELPA Syncer, 2022/04/22
- [nongnu] elpa/git-commit 1553a4fa36 11/26: Use and-let* for side-effects, ELPA Syncer, 2022/04/22
- [nongnu] elpa/git-commit 4bcb303154 12/26: Use and-let* for side-effects even more, ELPA Syncer, 2022/04/22
- [nongnu] elpa/git-commit 9ce3859dd2 13/26: Use when-let* for multiple bindings, ELPA Syncer, 2022/04/22
- [nongnu] elpa/git-commit 5f23a34a5f 19/26: Use compat-dired-marked-files, ELPA Syncer, 2022/04/22
- [nongnu] elpa/git-commit 4d1d00e6fa 20/26: Fix finding remote executables, ELPA Syncer, 2022/04/22
- [nongnu] elpa/git-commit 59fb9ce03f 06/26: Use string-replace instead of replace-regexp-in-string, ELPA Syncer, 2022/04/22
- [nongnu] elpa/git-commit bba16d4f3e 08/26: Use string-search instead of string-match, ELPA Syncer, 2022/04/22