home

commit e8c1700b24e0d24e703c7bd389f3c49ad9ea83c2
parent d250acb59303d31c09e5e856b2e459d8a36b92e6
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Mon, 20 Mar 2023 11:41:33 +0100

tools/emacs: load magit-popup

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
tools/emacs/config/config-vcs.el
 | 
6
++++--

1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/emacs/config/config-vcs.el b/tools/emacs/config/config-vcs.el
@@ -59,6 +59,8 @@
   (setq diff-font-lock-prettify nil)
   (setq diff-font-lock-syntax nil))
 
+(use-package magit-popup)
+
 (use-package magit
   :unless noninteractive
   :commands (magit-status magit-clone magit-pull magit-blame magit-log-buffer-file magit-log)
@@ -80,9 +82,9 @@
                 magit-display-buffer-function #'magit-display-buffer-traditional)
 
   (magit-define-popup-option 'magit-rebase-popup
-    ?S "Sign using gpg" "--gpg-sign=" #'magit-read-gpg-secret-key)
+                             ?S "Sign using gpg" "--gpg-sign=" #'magit-read-gpg-secret-key)
   (magit-define-popup-switch 'magit-log-popup
-    ?m "Omit merge commits" "--no-merges")
+                             ?m "Omit merge commits" "--no-merges")
   ;; cargo-culted from https://github.com/magit/magit/issues/3717#issuecomment-734798341
   ;; valid gitlab options are defined in https://docs.gitlab.com/ee/user/project/push_options.html
   ;;