branch: elpa/git-commit
commit c3268fc69d787371ca9689e6d5cafd675316eeb3
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
git-commit.el: Rearrange dependencies
Also state why we are going through all this trouble.
---
lisp/git-commit.el | 28 +++++++++++-----------------
1 file changed, 11 insertions(+), 17 deletions(-)
diff --git a/lisp/git-commit.el b/lisp/git-commit.el
index 0df9ae0045..883f082e04 100644
--- a/lisp/git-commit.el
+++ b/lisp/git-commit.el
@@ -116,15 +116,10 @@
;; M-x customize-group RET git-commit RET
;;; Code:
-;;;; Dependencies
(require 'seq)
(require 'subr-x)
-(require 'magit-base nil t)
-(require 'magit-git nil t)
-(require 'magit-mode nil t)
-
(require 'log-edit)
(require 'ring)
(require 'rx)
@@ -132,23 +127,22 @@
(require 'transient)
(require 'with-editor)
-(defvar recentf-exclude)
-
-;;;; Declarations
+;; For historic reasons Magit isn't a hard dependency.
+(unless (and (require 'magit-base nil t)
+ (require 'magit-git nil t))
+ (declare-function magit-completing-read "magit-base"
+ ( prompt collection &optional predicate require-match
+ initial-input hist def fallback))
+ (declare-function magit-expand-git-file-name "magit-git" (filename))
+ (declare-function magit-git-lines "magit-git" (&rest args))
+ (declare-function magit-hook-custom-get "magit-base" (symbol))
+ (declare-function magit-list-local-branch-names "magit-git" ()))
(defvar diff-default-read-only)
(defvar flyspell-generic-check-word-predicate)
(defvar font-lock-beg)
(defvar font-lock-end)
-
-(declare-function magit-completing-read "magit-base"
- (prompt collection &optional predicate require-match
- initial-input hist def fallback))
-(declare-function magit-expand-git-file-name "magit-git" (filename))
-(declare-function magit-git-lines "magit-git" (&rest args))
-(declare-function magit-list-local-branch-names "magit-git" ())
-(declare-function magit-list-remote-branch-names "magit-git"
- (&optional remote relative))
+(defvar recentf-exclude)
;;; Options
;;;; Variables
