branch: elpa/git-commit
commit e766c891fe6a279be9fe75ffe7d109e4b0684855
Author: Jonas Bernoulli <jo...@bernoul.li>
Commit: Jonas Bernoulli <jo...@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."
