emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/git-commit f29e5ca 1/2: git-rebase-action: New face


From: ELPA Syncer
Subject: [nongnu] elpa/git-commit f29e5ca 1/2: git-rebase-action: New face
Date: Tue, 23 Nov 2021 17:59:37 -0500 (EST)

branch: elpa/git-commit
commit f29e5ca95b3892044c79fb400d2bbf60829019fd
Author: Bastian Beranek <bastian.beranek@inovex.de>
Commit: Jonas Bernoulli <jonas@bernoul.li>

    git-rebase-action: New face
---
 Documentation/RelNotes/3.4.0.org |  3 +++
 lisp/git-rebase.el               | 17 +++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Documentation/RelNotes/3.4.0.org b/Documentation/RelNotes/3.4.0.org
index 01f6d84..9e2ab7c 100644
--- a/Documentation/RelNotes/3.4.0.org
+++ b/Documentation/RelNotes/3.4.0.org
@@ -10,6 +10,9 @@
 - Refreshing a repository or submodule list buffer now restores the
   previous position.
 
+- Added new face ~git-rebase-action~ to allow customization of the face
+  used for the action words in git-rebase-todo files.
+
 ** Fixes since v3.3.0
 
 - Automatic saving of file-visiting buffers was broken inside remote
diff --git a/lisp/git-rebase.el b/lisp/git-rebase.el
index 45d2824..4908908 100644
--- a/lisp/git-rebase.el
+++ b/lisp/git-rebase.el
@@ -124,6 +124,11 @@
   "Face for commit descriptions."
   :group 'git-rebase-faces)
 
+(defface git-rebase-action
+  '((t :inherit font-lock-keyword-face))
+  "Face for action keywords."
+  :group 'git-rebase-faces)
+
 (defface git-rebase-killed-action
   '((t :inherit font-lock-comment-face :strike-through t))
   "Face for commented commit action lines."
@@ -731,25 +736,25 @@ running 'man git-rebase' at the command line) for 
details."
 (defun git-rebase-mode-font-lock-keywords ()
   "Font lock keywords for Git-Rebase mode."
   `((,(concat "^" (cdr (assq 'commit git-rebase-line-regexps)))
-     (1 'font-lock-keyword-face)
+     (1 'git-rebase-action)
      (3 'git-rebase-hash)
      (4 'git-rebase-description))
     (,(concat "^" (cdr (assq 'exec git-rebase-line-regexps)))
-     (1 'font-lock-keyword-face)
+     (1 'git-rebase-action)
      (3 'git-rebase-description))
     (,(concat "^" (cdr (assq 'bare git-rebase-line-regexps)))
-     (1 'font-lock-keyword-face))
+     (1 'git-rebase-action))
     (,(concat "^" (cdr (assq 'label git-rebase-line-regexps)))
-     (1 'font-lock-keyword-face)
+     (1 'git-rebase-action)
      (3 'git-rebase-label)
      (4 'font-lock-comment-face))
     ("^\\(m\\(?:erge\\)?\\) -[Cc] \\([^ \n]+\\) \\([^ \n]+\\)\\( #.*\\)?"
-     (1 'font-lock-keyword-face)
+     (1 'git-rebase-action)
      (2 'git-rebase-hash)
      (3 'git-rebase-label)
      (4 'font-lock-comment-face))
     ("^\\(m\\(?:erge\\)?\\) \\([^ \n]+\\)"
-     (1 'font-lock-keyword-face)
+     (1 'git-rebase-action)
      (2 'git-rebase-label))
     (,(concat git-rebase-comment-re " *"
               (cdr (assq 'commit git-rebase-line-regexps)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]