branch: elpa/magit
commit 8b6bb7c7e88c298e1447ca7c86138588a3953784
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
git-commit.el: Require magit-process
There is a circular dependency between `magit-git' and `magit-process',
which we break by declaring some functions from the latter in the
former. This usually works out fine because loading `magit' loads both
libraries.
However, when someone only loads `git-commit', then this broke and to
fix it we have to explicitly require `magit-process' in that library
as well.
Also explicitly require `magit-git', even though that isn't strictly
necessary because `magit-mode' requires `magit-git'. Finally also
update the dependency declaration in "lisp/Makefile".
Closes #5280.
---
lisp/Makefile | 2 +-
lisp/git-commit.el | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/lisp/Makefile b/lisp/Makefile
index 28bd99fbb29..dcd3b193c94 100644
--- a/lisp/Makefile
+++ b/lisp/Makefile
@@ -9,13 +9,13 @@ all: lisp
## Build order #######################################################
-git-commit.elc:
magit-section.elc:
magit-base.elc: magit-section.elc
magit-git.elc: magit-base.elc
magit-mode.elc: magit-base.elc magit-git.elc
magit-margin.elc: magit-base.elc magit-mode.elc
magit-process.elc: magit-base.elc magit-git.elc magit-mode.elc
+git-commit.elc: magit-git.elc magit-mode.elc magit-process.elc
magit-transient.elc: magit-git.elc magit-mode.elc magit-process.elc
magit-autorevert.elc: magit-git.elc magit-process.elc
magit-core.elc: magit-base.elc magit-git.elc magit-mode.elc \
diff --git a/lisp/git-commit.el b/lisp/git-commit.el
index 54fd6415700..d1cbd9ba191 100644
--- a/lisp/git-commit.el
+++ b/lisp/git-commit.el
@@ -100,7 +100,9 @@
;;; Code:
+(require 'magit-git)
(require 'magit-mode)
+(require 'magit-process)
(require 'log-edit)
(require 'ring)
