From addce2b02e317d74b4937341fd407511fb095d10 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 8 Sep 2023 08:31:03 +0200
Subject: emacs: replace git-messenger with vc-msg

---
 user/emacs/init.el      | 8 +++-----
 user/settings/emacs.nix | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/user/emacs/init.el b/user/emacs/init.el
index 0efc5793..b9edb839 100644
--- a/user/emacs/init.el
+++ b/user/emacs/init.el
@@ -968,10 +968,8 @@ _p_rev       _u_pper              _=_: upper/lower       _r_esolve
             (setq git-gutter-fr:side 'left-fringe)
             (global-git-gutter-mode 1)))
 
-(use-package git-messenger
-  :commands (git-messenger:popup-message)
-  :defer 10
-  :config (setq git-messenger:use-magit-popup t))
+(use-package vc-msg
+  :defer 30)
 
 (use-package git-timemachine
   :commands (git-timemachine))
@@ -1105,7 +1103,7 @@ _p_rev       _u_pper              _=_: upper/lower       _r_esolve
   "fd" #'delete-file
   "fr" #'crux-rename-file-and-buffer
   "gs" #'magit-status
-  "gm" #'git-messenger:popup-message
+  "gm" #'vc-msg-show
   "gg" #'magit-dispatch
   "gn" #'git-gutter:next-hunk
   "gp" #'git-gutter:previous-hunk
diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix
index 1f59c1c9..2cc8424d 100644
--- a/user/settings/emacs.nix
+++ b/user/settings/emacs.nix
@@ -127,7 +127,6 @@ in
         flycheck
         general
         git-gutter-fringe
-        git-messenger
         git-modes
         git-timemachine
         goto-chg
@@ -156,6 +155,7 @@ in
         toml-mode
         treesit-grammars.with-all-grammars
         use-package
+        vc-msg
         vertico
         vertico-prescient
         wgrep-ag
-- 
cgit 1.4.1