From d4d78b23ea17f966837d953ae2f46ae4e2e2eb18 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 24 Apr 2026 05:16:57 -0400 Subject: [PATCH] fix(evil): ex commands The syntax for making certain parts of an ex command optional does not work if those parts are in the middle of the command (they have to be at the end), so many of these commands were partially non-functional (`l[ine]diff` could only be invoked with `:l[ine]`). Also renames some of these commands: - :linediff => :ldiff - :k[ill] => :kill - :k[ill]all => :killa[ll] - :k[ill]m => :killm[atch] - :k[ill]o => :killo[ther] - :k[ill]b => :killb[uried] --- modules/editor/evil/+commands.el | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/modules/editor/evil/+commands.el b/modules/editor/evil/+commands.el index 13e05272e..47932ddf6 100644 --- a/modules/editor/evil/+commands.el +++ b/modules/editor/evil/+commands.el @@ -13,7 +13,7 @@ (evil-ex-define-cmd "na[rrow]" #'+evil:narrow-buffer) (evil-ex-define-cmd "retab" #'+evil:retab) (evil-ex-define-cmd "rev[erse]" #'+evil:reverse-lines) -(evil-ex-define-cmd "l[ine]diff" #'evil-quick-diff) +(evil-ex-define-cmd "ldiff" #'evil-quick-diff) ;;; External resources ;; TODO: (evil-ex-define-cmd "db" #'doom:db) @@ -29,14 +29,14 @@ (evil-ex-define-cmd "pad" #'+evil:open-scratch-buffer) ;;; Dealing with buffers -(evil-ex-define-cmd "k[ill]" #'kill-current-buffer) -(evil-ex-define-cmd "k[ill]all" #'+evil:kill-all-buffers) -(evil-ex-define-cmd "k[ill]m" #'+evil:kill-matching-buffers) -(evil-ex-define-cmd "k[ill]o" #'doom/kill-other-buffers) -(evil-ex-define-cmd "k[ill]b" #'doom/kill-buried-buffers) -(evil-ex-define-cmd "l[ast]" #'+popup/restore) -(evil-ex-define-cmd "messages" #'view-echo-area-messages) -(evil-ex-define-cmd "pop[up]" #'+popup/buffer) +(evil-ex-define-cmd "kill" #'kill-current-buffer) +(evil-ex-define-cmd "killa[ll]" #'+evil:kill-all-buffers) +(evil-ex-define-cmd "killm[atch]" #'+evil:kill-matching-buffers) +(evil-ex-define-cmd "killo[ther]" #'doom/kill-other-buffers) +(evil-ex-define-cmd "killb[uried]" #'doom/kill-buried-buffers) +(evil-ex-define-cmd "l[ast]" #'+popup/restore) +(evil-ex-define-cmd "messages" #'view-echo-area-messages) +(evil-ex-define-cmd "pop[up]" #'+popup/buffer) ;;; Project navigation (evil-ex-define-cmd "a" #'find-sibling-file) @@ -44,14 +44,14 @@ (evil-ex-define-cmd "pwd" #'+evil:pwd) (cond ((modulep! :completion ivy) - (evil-ex-define-cmd "pg[rep]" #'+ivy:project-search) - (evil-ex-define-cmd "pg[grep]d" #'+ivy:project-search-from-cwd)) + (evil-ex-define-cmd "pg[rep]" #'+ivy:project-search) + (evil-ex-define-cmd "pdg[rep]" #'+ivy:project-search-from-cwd)) ((modulep! :completion helm) - (evil-ex-define-cmd "pg[rep]" #'+helm:project-search) - (evil-ex-define-cmd "pg[grep]d" #'+helm:project-search-from-cwd)) + (evil-ex-define-cmd "pg[rep]" #'+helm:project-search) + (evil-ex-define-cmd "pdg[rep]" #'+helm:project-search-from-cwd)) ((modulep! :completion vertico) - (evil-ex-define-cmd "pg[rep]" #'+vertico:project-search) - (evil-ex-define-cmd "pg[grep]d" #'+vertico:project-search-from-cwd))) + (evil-ex-define-cmd "pg[rep]" #'+vertico:project-search) + (evil-ex-define-cmd "pdg[rep]" #'+vertico:project-search-from-cwd))) ;;; Project tools (evil-ex-define-cmd "com[pile]" #'+evil:compile)