branch: elpa/magit
commit 9654f5e09403699ca0ad2c6276a8656dd5e5473b
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
git-rebase-mode-font-lock-keywords: Use magit-branch-local face
Use this face for branch names in "# Branch" and "merge" lines, but
do not use it in "label" lines. The former two mark the points were
a branch is created and merged, while the latter is an implementation,
needed for technical reasons.
Relocate the keyword for "# Branch", so that it is placed among the
action line keywords instead of after the keywords for the comments
that optionally follow the action lines.
---
lisp/git-rebase.el | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lisp/git-rebase.el b/lisp/git-rebase.el
index 2080a6e7a76..dbcb8535d78 100644
--- a/lisp/git-rebase.el
+++ b/lisp/git-rebase.el
@@ -831,9 +831,11 @@ running \"man git-rebase\" at the command line) for
details."
(1 'git-rebase-action)
(21 'git-rebase-action nil t)
(22 'git-rebase-hash t t)
- (3 'git-rebase-label)
+ (3 'magit-branch-local)
(4 'font-lock-comment-face nil t)
(5 'git-rebase-description nil t))
+ (,(format "^%s Branch \\(.*\\)" comment-start)
+ (1 'magit-branch-local t))
("^drop \\(.+\\)"
(1 'git-rebase-killed-action t))
(,(concat git-rebase-comment-re " *"
@@ -849,9 +851,7 @@ running \"man git-rebase\" at the command line) for
details."
(1 'git-rebase-comment-hash t)
(2 'git-rebase-comment-hash t))
(,(format "^%s \\(Commands:\\)" comment-start)
- (1 'git-rebase-comment-heading t))
- (,(format "^%s Branch \\(.*\\)" comment-start)
- (1 'git-rebase-label t))))
+ (1 'git-rebase-comment-heading t))))
(defun git-rebase-mode-show-keybindings ()
"Modify the \"Commands:\" section of the comment Git generates.
