Skip to content

Commit c3c442a

Browse files
authoredOct 27, 2022
Merge pull request #711 from emacs-php/feature/emacs28-font-lock-doc-markup-face
php-doc-annotation-tag inherits font-lock-doc-markup-face if defined
2 parents 0526c43 + b82b978 commit c3c442a

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed
 

‎CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ All notable changes of the PHP Mode 1.19.1 release series are documented in this
1414

1515
* Make continued expressions inside lists (arguments and arrays, etc.) have the same indent width as outside the list ([#703])
1616
* (internal) Improved readability of test failures about indentation ([#707])
17+
* `php-doc-annotation-tag` inherits `font-lock-doc-markup-face` if defined in Emacs 28 ([#711])
1718

1819
### Fixed
1920

@@ -24,6 +25,7 @@ All notable changes of the PHP Mode 1.19.1 release series are documented in this
2425
[#707]: https://github.com/emacs-php/php-mode/pull/707
2526
[#708]: https://github.com/emacs-php/php-mode/pull/708
2627
[#710]: https://github.com/emacs-php/php-mode/pull/710
28+
[#711]: https://github.com/emacs-php/php-mode/pull/711
2729

2830
## [1.24.1] - 2022-10-08
2931

‎lisp/php-face.el

+4-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,10 @@
175175
:group 'php-faces
176176
:tag "PHP php Tag")
177177

178-
(defface php-doc-annotation-tag '((t . (:inherit font-lock-constant-face)))
178+
(defface php-doc-annotation-tag (eval-when-compile
179+
(if (eval-when-compile (boundp 'font-lock-doc-markup-face))
180+
'((t . (:inherit font-lock-doc-markup-face)))
181+
'((t . (:inherit font-lock-constant-face)))))
179182
"Face used to highlight annotation tags in doc-comment."
180183
:group 'php-faces
181184
:tag "PHPDoc Annotation Tag")

0 commit comments

Comments
 (0)
Please sign in to comment.