mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
git.el: Don't use font-lock-compile-keywords
If font-lock is disabled, font-lock-compile-keywords complains. Really what we want to do is to replace log-edit's font-lock definitions with our own, so define a major mode deriving from log-edit and set up font-lock-defaults there. We then use the optional MODE argument to log-edit to set up the major mode of the commit buffer appropriately. Signed-off-by: Lawrence Mitchell <wence@gmx.li> Acked-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
6b3d83efac
commit
485cdb9bd8
|
@ -1310,6 +1310,13 @@ The FILES list must be sorted."
|
|||
(when sign-off (git-append-sign-off committer-name committer-email)))
|
||||
buffer))
|
||||
|
||||
(define-derived-mode git-log-edit-mode log-edit-mode "Git-Log-Edit"
|
||||
"Major mode for editing git log messages.
|
||||
|
||||
Set up git-specific `font-lock-keywords' for `log-edit-mode'."
|
||||
(set (make-local-variable 'font-lock-defaults)
|
||||
'(git-log-edit-font-lock-keywords t t)))
|
||||
|
||||
(defun git-commit-file ()
|
||||
"Commit the marked file(s), asking for a commit message."
|
||||
(interactive)
|
||||
|
@ -1335,9 +1342,9 @@ The FILES list must be sorted."
|
|||
(git-setup-log-buffer buffer (git-get-merge-heads) author-name author-email subject date))
|
||||
(if (boundp 'log-edit-diff-function)
|
||||
(log-edit 'git-do-commit nil '((log-edit-listfun . git-log-edit-files)
|
||||
(log-edit-diff-function . git-log-edit-diff)) buffer)
|
||||
(log-edit 'git-do-commit nil 'git-log-edit-files buffer))
|
||||
(setq font-lock-keywords (font-lock-compile-keywords git-log-edit-font-lock-keywords))
|
||||
(log-edit-diff-function . git-log-edit-diff)) buffer 'git-log-edit-mode)
|
||||
(log-edit 'git-do-commit nil 'git-log-edit-files buffer
|
||||
'git-log-edit-mode))
|
||||
(setq paragraph-separate (concat (regexp-quote git-log-msg-separator) "$\\|Author: \\|Date: \\|Merge: \\|Signed-off-by: \\|\f\\|[ ]*$"))
|
||||
(setq buffer-file-coding-system coding-system)
|
||||
(re-search-forward (regexp-quote (concat git-log-msg-separator "\n")) nil t))))
|
||||
|
|
Loading…
Reference in a new issue