Seq and Eldoc version issue workaround
This commit is contained in:
parent
d3a2027752
commit
23f4cf5205
@ -20,6 +20,33 @@
|
|||||||
(global-prettify-symbols-mode 1)
|
(global-prettify-symbols-mode 1)
|
||||||
(auto-insert-mode))
|
(auto-insert-mode))
|
||||||
|
|
||||||
|
;; seq version workaround, see https://www.reddit.com/r/emacs/comments/1937vaz/emacs_291_on_windows_install_magit_requires_seq/?rdt=48529
|
||||||
|
(defun +elpaca-unload-seq (e)
|
||||||
|
(and (featurep 'seq) (unload-feature 'seq t))
|
||||||
|
(elpaca--continue-build e))
|
||||||
|
(defun +elpaca-seq-build-steps ()
|
||||||
|
(append (butlast (if (file-exists-p (expand-file-name "seq" elpaca-builds-directory))
|
||||||
|
elpaca--pre-built-steps elpaca-build-steps))
|
||||||
|
(list '+elpaca-unload-seq 'elpaca--activate-package)))
|
||||||
|
(use-package seq :elpaca `(seq :build ,(+elpaca-seq-build-steps)))
|
||||||
|
|
||||||
|
;; eldoc version workarounds...
|
||||||
|
(defun global-eldoc-mode (&rest args)
|
||||||
|
"Placeholder function. Do nothing and return nil."
|
||||||
|
nil)
|
||||||
|
(defun +elpaca-unload-eldoc (e)
|
||||||
|
(and (featurep 'eldoc) (unload-feature 'eldoc t))
|
||||||
|
(elpaca--continue-build e))
|
||||||
|
(defun +elpaca-eldoc-build-steps ()
|
||||||
|
(append (butlast (if (file-exists-p (expand-file-name "eldoc" elpaca-builds-directory))
|
||||||
|
elpaca--pre-built-steps elpaca-build-steps))
|
||||||
|
(list '+elpaca-unload-eldoc 'elpaca--activate-package)))
|
||||||
|
(use-package eldoc
|
||||||
|
:elpaca `(eldoc :build ,(+elpaca-eldoc-build-steps))
|
||||||
|
:init
|
||||||
|
)
|
||||||
|
|
||||||
|
(elpaca-wait)
|
||||||
;; (use-package no-littering) ;a bad start, and we need more
|
;; (use-package no-littering) ;a bad start, and we need more
|
||||||
|
|
||||||
(use-package epg
|
(use-package epg
|
||||||
@ -85,6 +112,7 @@
|
|||||||
(elpaca-wait)
|
(elpaca-wait)
|
||||||
|
|
||||||
(use-package eldoc-box
|
(use-package eldoc-box
|
||||||
|
:after eldoc
|
||||||
:diminish (eldoc-mode eldoc-box-hover-at-point-mode)
|
:diminish (eldoc-mode eldoc-box-hover-at-point-mode)
|
||||||
:hook (prog-mode . eldoc-box-hover-at-point-mode))
|
:hook (prog-mode . eldoc-box-hover-at-point-mode))
|
||||||
|
|
||||||
@ -790,6 +818,7 @@ Return nil if DIR is not in a hugo project at all."
|
|||||||
|
|
||||||
;; epic drop-down completion
|
;; epic drop-down completion
|
||||||
(use-package corfu
|
(use-package corfu
|
||||||
|
:after eldoc
|
||||||
:elpaca (:files (:defaults "extensions/*.el"))
|
:elpaca (:files (:defaults "extensions/*.el"))
|
||||||
;; :if (display-graphic-p) ; breaks in emacsclient
|
;; :if (display-graphic-p) ; breaks in emacsclient
|
||||||
:custom
|
:custom
|
||||||
@ -851,6 +880,7 @@ Return nil if DIR is not in a hugo project at all."
|
|||||||
(corfu-terminal-mode +1)))
|
(corfu-terminal-mode +1)))
|
||||||
|
|
||||||
(use-package magit
|
(use-package magit
|
||||||
|
:after seq
|
||||||
:commands (madots magit-status magit)
|
:commands (madots magit-status magit)
|
||||||
:hook (magit-mode . turn-off-line-numbers)
|
:hook (magit-mode . turn-off-line-numbers)
|
||||||
:custom (vc-follow-symlinks t)
|
:custom (vc-follow-symlinks t)
|
||||||
@ -886,9 +916,10 @@ Return nil if DIR is not in a hugo project at all."
|
|||||||
(setq magit-bury-buffer-function #'kill-buffer-and-window)
|
(setq magit-bury-buffer-function #'kill-buffer-and-window)
|
||||||
(magit-status)
|
(magit-status)
|
||||||
(run-with-timer 5 3 #'madots--cleanup)))
|
(run-with-timer 5 3 #'madots--cleanup)))
|
||||||
(use-package magit-todos
|
;; ;; broken bc of hl-todo version issue
|
||||||
:after magit
|
;; (use-package magit-todos
|
||||||
:init (magit-todos-mode))
|
;; :after magit
|
||||||
|
;; :init (magit-todos-mode))
|
||||||
(use-package blamer
|
(use-package blamer
|
||||||
:elpaca (:host github :repo "artawower/blamer.el")
|
:elpaca (:host github :repo "artawower/blamer.el")
|
||||||
:after magit
|
:after magit
|
||||||
|
Loading…
Reference in New Issue
Block a user