[nongnu] elpa/php-mode c3c442a3fa 2/2: Merge pull request #711 from emacs-php/feature/emacs28-font-lock-doc-markup-face

[ELPA Syncer]

branch: elpa/php-mode
commit c3c442a3fa8714b17f166fb1f60f3326d583a22e
Merge: 0526c4310a b82b978f54
Author: USAMI Kenta <tadsan@pixiv.com>
Commit: GitHub <noreply@github.com>

    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
---
 CHANGELOG.md     | 2 ++
 lisp/php-face.el | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27b4cbde58..cd522ba1bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
 
@@ -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
 
diff --git a/lisp/php-face.el b/lisp/php-face.el
index ca7524c7d4..13fd0f6d4e 100644
--- a/lisp/php-face.el
+++ b/lisp/php-face.el
@@ -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")