Skip to content

Commit

Permalink
Merge pull request #711 from emacs-php/feature/emacs28-font-lock-doc-…
Browse files Browse the repository at this point in the history
…markup-face

php-doc-annotation-tag inherits font-lock-doc-markup-face if defined
  • Loading branch information
zonuexe authored Oct 27, 2022
2 parents 0526c43 + b82b978 commit c3c442a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ All notable changes of the PHP Mode 1.19.1 release series are documented in this

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

### Fixed

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

## [1.24.1] - 2022-10-08

Expand Down
5 changes: 4 additions & 1 deletion lisp/php-face.el
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,10 @@
:group 'php-faces
:tag "PHP php Tag")

(defface php-doc-annotation-tag '((t . (:inherit font-lock-constant-face)))
(defface php-doc-annotation-tag (eval-when-compile
(if (eval-when-compile (boundp 'font-lock-doc-markup-face))
'((t . (:inherit font-lock-doc-markup-face)))
'((t . (:inherit font-lock-constant-face)))))
"Face used to highlight annotation tags in doc-comment."
:group 'php-faces
:tag "PHPDoc Annotation Tag")
Expand Down

0 comments on commit c3c442a

Please sign in to comment.