From: Randy Taylor <dev@rjt.dev>
To: 58940@debbugs.gnu.org
Subject: bug#58940: [PATCH] feature/tree-sitter: Add more font lock faces
Date: Tue, 01 Nov 2022 01:21:03 +0000 [thread overview]
Message-ID: <FHp432jf0hZHIBAFEWooD8NgaaoPdq1TlfysZgbmKbNAai2EBqKUbkY-jRFHGGm4qjUjc61YF3MaSvLnKFegGFuyS8vFvJwkk-Id0O18-J4=@rjt.dev> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 490 bytes --]
The attached patch adds the following faces:
- font-lock-escape-face
- font-lock-number-face
- font-lock-operator-face
- font-lock-property-face
- font-lock-punctuation-face
font-lock-property-face inherits font-lock-variable-name-face which matches the behaviour of cc-mode and python-mode.
font-lock-escape-face inherits nothing. In python-mode, it inherits font-lock-constant-face, but not in cc-mode. Do we want it to inherit anything?
Hopefully I put everything in the right place.
[-- Attachment #1.2: Type: text/html, Size: 1251 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Add-more-font-lock-faces.patch --]
[-- Type: text/x-patch; name=0001-Add-more-font-lock-faces.patch, Size: 5197 bytes --]
From 8f05a744744143ce05a0eee0ab8ac9926bc5f3eb Mon Sep 17 00:00:00 2001
From: Randy Taylor <dev@rjt.dev>
Date: Fri, 28 Oct 2022 22:39:50 -0400
Subject: [PATCH] Add more font-lock faces
* lisp/font-lock.el (font-lock-escape-face, font-lock-number-face,
font-lock-operator-face, font-lock-property-face,
font-lock-punctuation-face): Define new faces.
* lisp/cus-theme.el (custom-theme--listed-faces): Add them to the list.
* doc/lispref/modes.texi (Faces for Font Lock): Document them.
* etc/NEWS: Mention them.
---
doc/lispref/modes.texi | 21 ++++++++++++++++++++
etc/NEWS | 5 +++++
lisp/cus-theme.el | 7 +++++--
lisp/font-lock.el | 45 ++++++++++++++++++++++++++++++++++++++++++
4 files changed, 76 insertions(+), 2 deletions(-)
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index f587252422..0095d62026 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3653,6 +3653,27 @@ Faces for Font Lock
@item font-lock-negation-char-face
@vindex font-lock-negation-char-face
for easily-overlooked negation characters.
+
+@item font-lock-escape-face
+@vindex font-lock-escape-face
+for escape sequences in strings.
+
+@item font-lock-number-face
+@vindex font-lock-number-face
+for numbers.
+
+@item font-lock-operator-face
+@vindex font-lock-operator-face
+for operators.
+
+@item font-lock-property-face
+@vindex font-lock-property-face
+for properties, such as fields of a struct or class.
+This face inherits, by default, from @code{font-lock-variable-name-face}.
+
+@item font-lock-punctuation-face
+@vindex font-lock-punctuation-face
+for punctuation.
@end table
@node Syntactic Font Lock
diff --git a/etc/NEWS b/etc/NEWS
index c5a142b500..b1e342eff6 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -732,6 +732,11 @@ If the current buffer is visiting a file that is executable, the
This determines how long to pause Emacs after a process
filter/sentinel error has been handled.
++++
+** New faces for font-lock.
+'font-lock-escape-face', 'font-lock-number-face', 'font-lock-operator-face',
+'font-lock-property-face', 'font-lock-punctuation-face'.
+
+++
** New face 'variable-pitch-text'.
This face is like 'variable-pitch' (from which it inherits), but is
diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el
index 90680ff68f..a977d6834c 100644
--- a/lisp/cus-theme.el
+++ b/lisp/cus-theme.el
@@ -68,9 +68,12 @@ custom-theme--listed-faces
shadow secondary-selection trailing-whitespace
font-lock-builtin-face font-lock-comment-delimiter-face
font-lock-comment-face font-lock-constant-face
- font-lock-doc-face font-lock-doc-markup-face font-lock-function-name-face
+ font-lock-doc-face font-lock-doc-markup-face
+ font-lock-escape-face font-lock-function-name-face
font-lock-keyword-face font-lock-negation-char-face
- font-lock-preprocessor-face font-lock-regexp-grouping-backslash
+ font-lock-number-face font-lock-operator-face
+ font-lock-preprocessor-face font-lock-property-face
+ font-lock-punctuation-face font-lock-regexp-grouping-backslash
font-lock-regexp-grouping-construct font-lock-string-face
font-lock-type-face font-lock-variable-name-face
font-lock-warning-face button link link-visited fringe
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index b6f4150964..51c0b156ee 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -359,6 +359,21 @@ font-lock-negation-char-face
(defvar font-lock-preprocessor-face 'font-lock-preprocessor-face
"Face name to use for preprocessor directives.")
+(defvar font-lock-escape-face 'font-lock-escape-face
+ "Face name to use for escape sequences in strings.")
+
+(defvar font-lock-number-face 'font-lock-number-face
+ "Face name to use for numbers.")
+
+(defvar font-lock-operator-face 'font-lock-operator-face
+ "Face name to use for operators.")
+
+(defvar font-lock-property-face 'font-lock-property-face
+ "Face name to use for properties.")
+
+(defvar font-lock-punctuation-face 'font-lock-punctuation-face
+ "Face name to use for punctuation.")
+
;; Fontification variables:
(defvar font-lock-keywords nil
@@ -2073,6 +2088,36 @@ font-lock-preprocessor-face
"Font Lock mode face used to highlight preprocessor directives."
:group 'font-lock-faces)
+(defface font-lock-escape-face
+ '((t nil))
+ "Font Lock mode face used to highlight escape sequences in strings."
+ :group 'font-lock-faces
+ :version "29.1")
+
+(defface font-lock-number-face
+ '((t nil))
+ "Font Lock mode face used to highlight numbers."
+ :group 'font-lock-faces
+ :version "29.1")
+
+(defface font-lock-operator-face
+ '((t nil))
+ "Font Lock mode face used to highlight operators."
+ :group 'font-lock-faces
+ :version "29.1")
+
+(defface font-lock-property-face
+ '((t :inherit font-lock-variable-name-face))
+ "Font Lock mode face used to highlight properties."
+ :group 'font-lock-faces
+ :version "29.1")
+
+(defface font-lock-punctuation-face
+ '((t nil))
+ "Font Lock mode face used to highlight punctuation."
+ :group 'font-lock-faces
+ :version "29.1")
+
(defface font-lock-regexp-grouping-backslash
'((t :inherit bold))
"Font Lock mode face for backslashes in Lisp regexp grouping constructs."
--
2.38.1
next reply other threads:[~2022-11-01 1:21 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-01 1:21 Randy Taylor [this message]
2022-11-01 2:14 ` bug#58940: [PATCH] feature/tree-sitter: Add more font lock faces Yuan Fu
2022-11-02 2:04 ` Randy Taylor
2022-11-02 12:27 ` Eli Zaretskii
2022-11-05 2:46 ` Randy Taylor
2022-11-05 9:24 ` Eli Zaretskii
2022-11-06 1:00 ` Randy Taylor
2022-11-06 6:14 ` Eli Zaretskii
2022-11-06 14:05 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-11-06 16:43 ` Randy Taylor
2022-11-06 19:24 ` Stefan Kangas
2022-11-07 1:33 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-11-07 3:31 ` Eli Zaretskii
2022-11-06 8:22 ` Eli Zaretskii
2022-11-06 17:02 ` Randy Taylor
2022-11-10 2:47 ` Randy Taylor
2022-11-10 3:59 ` Yuan Fu
2022-11-10 11:06 ` Eli Zaretskii
2022-11-01 22:54 ` Dmitry Gutov
2022-11-02 2:30 ` Randy Taylor
2022-11-02 13:41 ` Dmitry Gutov
2022-11-03 2:30 ` Randy Taylor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='FHp432jf0hZHIBAFEWooD8NgaaoPdq1TlfysZgbmKbNAai2EBqKUbkY-jRFHGGm4qjUjc61YF3MaSvLnKFegGFuyS8vFvJwkk-Id0O18-J4=@rjt.dev' \
--to=dev@rjt.dev \
--cc=58940@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.