branch: elpa/magit
commit d6593a4e36cef70ff206c0243646975774b4872b
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
Require dired, message and epa directly
We require `vc-git' for some minor functionality. Loading that took
care of making some of our own dependencies available. Emacs commit
[1: 2ee74aca554] stops requiring `message', and as a result we now
have to require that and `dired' and `epa' in the appropriate places
ourselves.
1: 2025-09-12 2ee74aca554786c20193b528363eb426e4f7f65c
Delete obsolete log-edit-beginning-of-line
---
lisp/magit-apply.el | 1 +
lisp/magit-dired.el | 2 ++
lisp/magit-patch.el | 3 +++
lisp/magit.el | 6 +-----
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/lisp/magit-apply.el b/lisp/magit-apply.el
index 8f7623c8127..a5b19efb343 100644
--- a/lisp/magit-apply.el
+++ b/lisp/magit-apply.el
@@ -33,6 +33,7 @@
(require 'magit-diff)
(require 'magit-wip)
+(require 'dired)
(require 'transient) ; See #3732.
;; For `magit-apply'
diff --git a/lisp/magit-dired.el b/lisp/magit-dired.el
index f3e91527b30..b7384e2757b 100644
--- a/lisp/magit-dired.el
+++ b/lisp/magit-dired.el
@@ -28,6 +28,8 @@
(require 'magit)
+(require 'dired)
+
;; For `magit-do-async-shell-command'.
(declare-function dired-read-shell-command "dired-aux" (prompt arg files))
diff --git a/lisp/magit-patch.el b/lisp/magit-patch.el
index e592521e841..0d90363557f 100644
--- a/lisp/magit-patch.el
+++ b/lisp/magit-patch.el
@@ -28,6 +28,8 @@
(require 'magit)
+(declare-function message-goto-body "message" (&optional interactive))
+
;;; Options
(defcustom magit-patch-save-arguments '(exclude "--stat")
@@ -314,6 +316,7 @@ is asked to pull. START has to be reachable from that
commit."
(list (magit-get "remote" (magit-read-remote "Remote") "url")
(magit-read-branch-or-commit "Start" (magit-get-upstream-branch))
(magit-read-branch-or-commit "End")))
+ (require 'message)
(let ((dir default-directory))
;; mu4e changes default-directory
(compose-mail)
diff --git a/lisp/magit.el b/lisp/magit.el
index ee38e941e65..a4773f5373f 100644
--- a/lisp/magit.el
+++ b/lisp/magit.el
@@ -69,15 +69,11 @@
(require 'magit-repos)
(require 'git-commit)
+(require 'epa) ;used in magit-read-gpg-{secret,signing}-key
(require 'format-spec)
(require 'package nil t) ; used in `magit-version'
(require 'with-editor)
-;; For `magit:--gpg-sign'
-(declare-function epg-list-keys "epg" (context &optional name mode))
-(declare-function epg-decode-dn "epg" (alist))
-(defvar epa-protocol)
-
;;; Options
(defcustom magit-openpgp-default-signing-key nil
