1 files changed, 15 insertions, 11 deletions

diff --git a/modules/prog-general.el b/modules/prog-general.el
index 968032831..f22f89923 100644
--- a/modules/prog-general.el
+++ b/modules/prog-general.el
@@ -59,13 +59,16 @@
 (declare-function treesit-auto-add-to-auto-mode-alist "treesit-auto")
 (declare-function treesit-auto-recipe-lang "treesit-auto")
 (declare-function highlight-indent-guides-mode "highlight-indent-guides")
+(declare-function electric-pair-default-inhibit "elec-pair")
+(declare-function yas-reload-all "yasnippet")
+(declare-function yas-activate-extra-mode "yasnippet")
 
 ;; Forward declarations for treesit-auto variables
 (defvar treesit-auto-recipe-list)
+(defvar electric-pair-inhibit-predicate)
 
 ;; Forward declarations for functions defined later in this file
 (declare-function cj/project-switch-actions "prog-general")
-(declare-function cj/deadgrep--initial-term "prog-general")
 
 (defun cj/find-project-root-file (regexp)
   "Return first file in the current Projectile project root matching REGEXP.
@@ -287,6 +290,16 @@ seeded by `cj/deadgrep--initial-term'.  Shared tail of the deadgrep commands."
 (with-eval-after-load 'dired
   (keymap-set dired-mode-map "G" #'cj/deadgrep-here))
 
+;; ------------------------------------ wgrep ----------------------------------
+;; Make a grep buffer editable, then write the edits back across files -- turns
+;; a consult-grep / embark-export result into a project-wide find-and-replace.
+;; In a grep buffer: C-c C-p to start editing, C-c C-c to apply.
+
+(use-package wgrep
+  :custom
+  (wgrep-auto-save-buffer t)        ;; save the touched files when applying
+  (wgrep-change-readonly-file t))   ;; let edits flow into read-only buffers
+
 
 ;; ---------------------------------- Snippets ---------------------------------
 ;; reusable code and text
@@ -371,16 +384,7 @@ defer to `electric-pair-default-inhibit' for any other CHAR."
 (use-package hl-todo
   :defer 1
   :hook
-  (prog-mode . hl-todo-mode)
-  :config
-  (setq hl-todo-keyword-faces
-		'(("FIXME"  . "#FF0000")
-		  ("BUG"    . "#FF0000")
-		  ("HACK"   . "#FF0000")
-		  ("ISSUE"  . "#DAA520")
-		  ("TASK"   . "#DAA520")
-		  ("NOTE"   . "#2C780E")
-		  ("WIP"   .  "#1E90FF"))))
+  (prog-mode . hl-todo-mode))
 
 ;; --------------------------- Whitespace Management ---------------------------
 ;; trims trailing whitespace only from lines you've modified when saving buffer