Hi, +CC: Florain Ragwitz
PJ Weisberg writes: > On Wednesday, April 27, 2011, Ævar Arnfjörð Bjarmason <[email protected]> > wrote: > > Agreed, and if we'd integrate this mode into magit going over the > > limit would be painfully obvious to anyone: > > https://github.com/rafl/git-commit-mode > > That's licensed under GPL-2; Magit is licensed under GPL-3+. IANAL, > but I know that those two licenses are incompatible. [1] I spoke to Florian about this- while he's not opposed to re-licensing git-commit-mode, he says that it'll be unnecessary, since we'll only be require'ing in our code. Further, since the project is useful independent of Magit, I don't think we should track git-commit.el in our code; instead, I propose using something like Git submodules. The glue code turns out to be pretty trivial too- here's a sample of what I'm using. Signed-off-by: Ramkumar Ramachandra <[email protected]> diff --git a/magit.el b/magit.el index 4a784ca..3fc18e7 100644 --- a/magit.el +++ b/magit.el @@ -3712,10 +3712,17 @@ typing and automatically refreshes the status buffer." (defvar magit-pre-log-edit-window-configuration nil) -(define-derived-mode magit-log-edit-mode text-mode "Magit Log Edit" - ;; Recognize changelog-style paragraphs - (set (make-local-variable 'paragraph-start) - (concat paragraph-start "\\|*\\|("))) +(if (require 'git-commit nil 'noerror) + (define-derived-mode magit-log-edit-mode git-commit-mode "Magit Log Edit" + ;; Recognize changelog-style paragraphs + (define-key magit-log-edit-mode-map (kbd "C-c C-s") 'git-commit-signoff) + (set (make-local-variable 'paragraph-start) + (concat paragraph-start "\\|*\\|("))) + (define-derived-mode magit-log-edit-mode text-mode "Magit Log Edit" + ;; Recognize changelog-style paragraphs + (set (make-local-variable 'paragraph-start) + (concat paragraph-start "\\|*\\|(")))) + (defun magit-log-edit-cleanup () (save-excursion
