From 72c03965cca497a6f950f7b02828fa4af8ac27f0 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 17 Jul 2020 01:17:22 -0400 Subject: [PATCH] Bump :editor evil emacs-evil/evil@25fc5c6 -> emacs-evil/evil@017b442 emacs-evil/evil-collection@e065da3 -> emacs-evil/evil-collection@3e62b6b emacs-evil/evil-surround@1c34944 -> emacs-evil/evil-surround@346d4d8 redguardtoo/evil-nerd-commenter@1bd2de5 -> redguardtoo/evil-nerd-commenter@87734b9 Some functionality has been upstreamed into evil-collection and thus removed from their respective modules. Closes #3577 --- modules/editor/evil/init.el | 8 ++++--- modules/editor/evil/packages.el | 8 +++---- modules/term/eshell/autoload/evil.el | 35 ---------------------------- modules/term/eshell/config.el | 4 ---- modules/tools/magit/config.el | 5 +--- 5 files changed, 10 insertions(+), 50 deletions(-) diff --git a/modules/editor/evil/init.el b/modules/editor/evil/init.el index ce58fe724..61a831503 100644 --- a/modules/editor/evil/init.el +++ b/modules/editor/evil/init.el @@ -111,6 +111,7 @@ variable for an explanation of the defaults (in comments). See edebug ediff eglot + explain-pause-mode elfeed elisp-mode elisp-refs @@ -158,7 +159,6 @@ variable for an explanation of the defaults (in comments). See man magit magit-todos - ,@(if evil-collection-setup-minibuffer '(minibuffer)) monky mu4e mu4e-conversation @@ -174,7 +174,7 @@ variable for an explanation of the defaults (in comments). See (pdf pdf-tools) popup proced - process-menu + (process-menu simple) prodigy profiler python @@ -190,6 +190,7 @@ variable for an explanation of the defaults (in comments). See simple slime sly + speedbar tablist tar-mode (term term ansi-term multi-term) @@ -210,7 +211,6 @@ variable for an explanation of the defaults (in comments). See which-key woman xref - xwidget youtube-dl (ztree ztree-diff))) @@ -264,6 +264,8 @@ and complains if a module is loaded too early (during startup)." (when evil-collection-setup-minibuffer (+evil-collection-init 'minibuffer) (evil-collection-minibuffer-insert))) + (add-transient-hook! 'xwidget-webkit-mode + (+evil-collection-init 'xwidget)) ;; HACK Do this ourselves because evil-collection break's `eval-after-load' ;; load order by loading their target plugin before applying keys. This diff --git a/modules/editor/evil/packages.el b/modules/editor/evil/packages.el index b28dfbcff..e833e6d62 100644 --- a/modules/editor/evil/packages.el +++ b/modules/editor/evil/packages.el @@ -1,7 +1,7 @@ ;; -*- no-byte-compile: t; -*- ;;; editor/evil/packages.el -(package! evil :pin "25fc5c6647979357cf3e39f0667a9b7ae5266af9") +(package! evil :pin "017b4421e24786a2f593d5e5c9ea0525e4ff272d") (package! evil-args :pin "758ad5ae54ad34202064fec192c88151c08cb387") (package! evil-easymotion :pin "f96c2ed38ddc07908db7c3c11bcd6285a3e8c2e9") (package! evil-embrace :pin "4379adea032b25e359d01a36301b4a5afdd0d1b7") @@ -11,12 +11,12 @@ (package! evil-exchange :pin "3030e21ee16a42dfce7f7cf86147b778b3f5d8c1") (package! evil-indent-plus :pin "0c7501e6efed661242c3a20e0a6c79a6455c2c40") (package! evil-lion :pin "6b03593f5dd6e7c9ca02207f9a73615cf94c93ab") -(package! evil-nerd-commenter :pin "1bd2de52011c39777a3e8779b14cee2790dc873b") +(package! evil-nerd-commenter :pin "87734b9c7fcd047f73a072b9d03ec05f786eeb03") (package! evil-numbers :recipe (:host github :repo "janpath/evil-numbers") :pin "c2cfdd1eb1f193bea28ee79b191b78309677058a") (package! evil-snipe :pin "6dcac7f2516c6137a2de532fc2c052f242559ee3") -(package! evil-surround :pin "1c34944d8c98da4a2385d24ee89eef9cdf569a12") +(package! evil-surround :pin "346d4d85fcf1f9517e9c4991c1efe68b4130f93a") (package! evil-textobj-anyblock :pin "ff00980f0634f95bf2ad9956b615a155ea8743be") (package! evil-traces :pin "bc25cae9fa5ab0ba1507827f0944f52ce0ca7462") (package! evil-visualstar :pin "06c053d8f7381f91c53311b1234872ca96ced752") @@ -33,4 +33,4 @@ (package! neotree) (autoload 'neotree-make-executor "neotree" nil nil 'macro)) - (package! evil-collection :pin "e065da3732f015428bd0068481dadad9e0e6d09c")) + (package! evil-collection :pin "3e62b6b1312f7907081be41a032aaacffa732fef")) diff --git a/modules/term/eshell/autoload/evil.el b/modules/term/eshell/autoload/evil.el index 04e45d377..e024063fa 100644 --- a/modules/term/eshell/autoload/evil.el +++ b/modules/term/eshell/autoload/evil.el @@ -32,38 +32,3 @@ already there)." (interactive) (goto-char (point-max)) (evil-append 1)) - -;;;###autoload (autoload '+eshell/evil-change "term/eshell/autoload/evil" nil t) -(evil-define-operator +eshell/evil-change (beg end type register yank-handler delete-func) - "Like `evil-change' but will not delete/copy the prompt." - (interactive "") - (save-restriction - (narrow-to-region eshell-last-output-end (point-max)) - (evil-change (max beg (point-min)) - (if (eq type 'line) (point-max) (min (or end (point-max)) (point-max))) - type register yank-handler delete-func))) - -;;;###autoload (autoload '+eshell/evil-change-line "term/eshell/autoload/evil" nil t) -(evil-define-operator +eshell/evil-change-line (beg end type register yank-handler) - "Change to end of line." - :motion evil-end-of-line - (interactive "") - (+eshell/evil-change beg end type register yank-handler #'evil-delete-line)) - -;;;###autoload (autoload '+eshell/evil-delete "term/eshell/autoload/evil" nil t) -(evil-define-operator +eshell/evil-delete (beg end type register yank-handler) - "Like `evil-delete' but will not delete/copy the prompt." - (interactive "") - (save-restriction - (narrow-to-region eshell-last-output-end (point-max)) - (evil-delete (if beg (max beg (point-min)) (point-min)) - (if (eq type 'line) (point-max) (min (or end (point-max)) (point-max))) - type register yank-handler))) - -;;;###autoload (autoload '+eshell/evil-delete-line "term/eshell/autoload/evil" nil t) -(evil-define-operator +eshell/evil-delete-line (_beg end type register yank-handler) - "Change to end of line." - :motion nil - :keep-visual t - (interactive "") - (+eshell/evil-delete (point) end type register yank-handler)) diff --git a/modules/term/eshell/config.el b/modules/term/eshell/config.el index 5a4f9bcfd..778e0a5cf 100644 --- a/modules/term/eshell/config.el +++ b/modules/term/eshell/config.el @@ -126,10 +126,6 @@ You should use `set-eshell-alias!' to change this.") (map! :map eshell-mode-map :n "RET" #'+eshell/goto-end-of-prompt :n [return] #'+eshell/goto-end-of-prompt - :n "c" #'+eshell/evil-change - :n "C" #'+eshell/evil-change-line - :n "d" #'+eshell/evil-delete - :n "D" #'+eshell/evil-delete-line :ni "C-j" #'eshell-next-matching-input-from-input :ni "C-k" #'eshell-previous-matching-input-from-input :ig "C-d" #'+eshell/quit-or-delete-char diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el index 28d2c0a66..175bca6c9 100644 --- a/modules/tools/magit/config.el +++ b/modules/tools/magit/config.el @@ -149,10 +149,7 @@ ensure it is built when we actually use Forge." :after magit :config (setq magit-todos-keyword-suffix "\\(?:([^)]+)\\)?:?") ; make colon optional - (define-key magit-todos-section-map "j" nil) - ;; Warns that jT isn't bound. Well, yeah, you don't need to tell me, that was - ;; on purpose ya goose. - (advice-add #'magit-todos-mode :around #'doom-shut-up-a)) + (define-key magit-todos-section-map "j" nil)) (use-package! magit-gitflow