aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgcv <gepardcv@gmail.com>2021-11-21 20:51:20 -0800
committerGitHub <noreply@github.com>2021-11-21 20:51:20 -0800
commit210ed1304960d067776365ae2d3883d072054e4e (patch)
tree6a0bba5ec92d303bce1f092620ff3aaeb2eb6733
parent54dc30840c8019f387ccdb84bbab06ca2cf8f296 (diff)
parent5b5e4a06a88708d500186dff9122263cd53c49ba (diff)
Merge pull request #170 from aaronjensen/do-not-require
Do not require which-key and xref
-rw-r--r--perspective.el7
1 files changed, 2 insertions, 5 deletions
diff --git a/perspective.el b/perspective.el
index 2a6a286..670fdf9 100644
--- a/perspective.el
+++ b/perspective.el
@@ -336,9 +336,7 @@ Run with the activated perspective active.")
(define-key perspective-map (kbd "9") (lambda () (interactive) (persp-switch-by-number 9)))
(define-key perspective-map (kbd "0") (lambda () (interactive) (persp-switch-by-number 10)))
-(declare-function which-key-mode "which-key.el")
-(when (fboundp 'which-key-mode)
- (require 'which-key)
+(with-eval-after-load 'which-key
(declare-function which-key-add-keymap-based-replacements "which-key.el")
(when (fboundp 'which-key-add-keymap-based-replacements)
(which-key-add-keymap-based-replacements perspective-map
@@ -1946,8 +1944,7 @@ restored."
;;; --- xref code
;; xref is not available in Emacs 24, so be careful:
-(when (require 'xref nil t)
-
+(with-eval-after-load 'xref
(defvar persp--xref-marker-ring (make-hash-table :test 'equal))
(defun persp--set-xref-marker-ring ()