branch: elpa/magit
commit 6d9ab06ee0c10fe25bcff4a4088bf88e8d62d739
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
Load magit-autoloads only in interactive sessions
---
lisp/magit-sequence.el | 6 ++++--
lisp/magit-status.el | 2 ++
lisp/magit.el | 7 ++++---
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/lisp/magit-sequence.el b/lisp/magit-sequence.el
index f12e311d881..8612f04fb19 100644
--- a/lisp/magit-sequence.el
+++ b/lisp/magit-sequence.el
@@ -33,10 +33,12 @@
;; For `magit-rebase--todo'.
(declare-function git-rebase-current-line "git-rebase" (&optional batch))
(eval-and-compile
- (cl-pushnew 'action-type eieio--known-slot-names)
+ (cl-pushnew 'abbrev eieio--known-slot-names)
(cl-pushnew 'action eieio--known-slot-names)
(cl-pushnew 'action-options eieio--known-slot-names)
- (cl-pushnew 'target eieio--known-slot-names))
+ (cl-pushnew 'action-type eieio--known-slot-names)
+ (cl-pushnew 'target eieio--known-slot-names)
+ (cl-pushnew 'trailer eieio--known-slot-names))
;;; Options
;;;; Faces
diff --git a/lisp/magit-status.el b/lisp/magit-status.el
index 0ac1169a6cf..b963864452a 100644
--- a/lisp/magit-status.el
+++ b/lisp/magit-status.el
@@ -28,6 +28,8 @@
(require 'magit)
+(declare-function magit-dired-jump "magit-dired" (&optional other-window))
+
;;; Options
(defgroup magit-status nil
diff --git a/lisp/magit.el b/lisp/magit.el
index 011cf2ef7c9..7118a94761d 100644
--- a/lisp/magit.el
+++ b/lisp/magit.el
@@ -772,9 +772,10 @@ For X11 something like ~/.xinitrc should work.\n"
(require 'magit-stash)
(require 'magit-blame)
(require 'magit-submodule)
- ;; The `provide' form may be missing so we have to
- ;; try harder to ensure this is loaded exactly once.
- (unless (or (featurep 'magit-autoloads)
+ (unless (or noninteractive
+ ;; The `provide' form may be missing so we have to
+ ;; try harder to ensure this is loaded exactly once.
+ (featurep 'magit-autoloads)
(autoloadp (symbol-function 'magit-patch))
(load "magit-autoloads" t t))
(require 'magit-patch)
