aboutsummaryrefslogtreecommitdiffstats
path: root/oni-git-commit.el
diff options
context:
space:
mode:
authorGravatar Tom Willemse2023-02-24 23:34:20 -0800
committerGravatar Tom Willemse2023-02-24 23:34:20 -0800
commitd8ff9915ba03b2dc461e6cc71ffd7b372613bbe6 (patch)
treeab800c2d9437b4404fa1a99d8f643a20e149298a /oni-git-commit.el
parent6dd72d53233fe1c79eba80dcdc6de36f2f784f5f (diff)
downloademacs-config-d8ff9915ba03b2dc461e6cc71ffd7b372613bbe6.tar.gz
emacs-config-d8ff9915ba03b2dc461e6cc71ffd7b372613bbe6.zip
feat(oni-git-commit): Refrain from refilling default commit comment
When I write a commit message there is always the default comment that lists which files are to be committed, which files aren't staged for commit, and which files are just entirely unknown to git at the moment. By default with ‘refill-mode’ turned on (which I have to make it easier to modify paragraphs after I've written them) this comment usually gets all garbled by the refill command. This bit of code prevents the comment from being filled initially.
Diffstat (limited to 'oni-git-commit.el')
-rw-r--r--oni-git-commit.el24
1 files changed, 23 insertions, 1 deletions
diff --git a/oni-git-commit.el b/oni-git-commit.el
index bcdf2b1..9aaa487 100644
--- a/oni-git-commit.el
+++ b/oni-git-commit.el
@@ -4,7 +4,7 @@
;; Author: Tom Willemse <tom@ryuslash.org>
;; Keywords: local
-;; Version: 2021.1130.152816
+;; Version: 2022.1207.083737
;; Package-Requires: (git-commit)
;; This program is free software; you can redistribute it and/or modify
@@ -26,9 +26,31 @@
;;; Code:
+(require 'git-commit)
+
+(eval-when-compile
+ (require 'refill))
+
+(defun oni-git-commit-disable-comment-refill (_ _ _)
+ "Clear ‘refill-doit’ if ‘auto-fill-inhibit-regexp’ matches."
+ (when (and git-commit-mode
+ refill-doit
+ (save-excursion
+ (goto-char refill-doit)
+ (looking-at auto-fill-inhibit-regexp)))
+ (setq refill-doit nil)))
+
+(defun oni-git-commit-set-auto-fill-inhibit-regexp ()
+ "Set the ‘auto-fill-inhibit-regexp’ to match git commit comments."
+ (setq-local auto-fill-inhibit-regexp (rx (minimal-match (zero-or-more "\n")) "#")))
+
+(add-hook 'git-commit-mode-hook #'oni-git-commit-set-auto-fill-inhibit-regexp)
(add-hook 'git-commit-mode-hook 'electric-pair-local-mode)
(add-hook 'git-commit-mode-hook 'electric-quote-local-mode)
(add-hook 'git-commit-mode-hook 'refill-mode)
+(add-function :after (symbol-function 'refill-after-change-function)
+ #'oni-git-commit-disable-comment-refill)
+
(provide 'oni-git-commit)
;;; oni-git-commit.el ends here