[nongnu] elpa/d-mode 3731f1b 316/346: Fontify built-in @-keywords as keywords

[ELPA Syncer]

branch: elpa/d-mode
commit 3731f1b0d4536e6c8b9a04a7ff61469467649efd
Author: Vladimir Panteleev <git@thecybershadow.net>
Commit: Vladimir Panteleev <git@thecybershadow.net>

    Fontify built-in @-keywords as keywords
    
    - Visually distinguish them from UDAs
    - Don't needlessly distinguish e.g. pure and @safe
---
 d-mode.el                    | 5 +++--
 tests/I0093_541009399.d.html | 2 +-
 tests/I0093_552200397.d.html | 2 +-
 tests/fonts.d.html           | 2 +-
 tests/fonts_types.d.html     | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/d-mode.el b/d-mode.el
index a6a084d..68ec2e0 100644
--- a/d-mode.el
+++ b/d-mode.el
@@ -7,7 +7,7 @@
 ;; Maintainer:  Russel Winder <russel@winder.org.uk>
 ;;              Vladimir Panteleev <vladimir@thecybershadow.net>
 ;; Created:  March 2007
-;; Version:  201911121107
+;; Version:  201911121117
 ;; Keywords:  D programming language emacs cc-mode
 ;; Package-Requires: ((emacs "25.1"))
 
@@ -221,7 +221,8 @@ operators."
       "enum" "export" "extern" "final" "immutable" "in" "inout" "lazy"
       "nothrow" "out" "override" "package" "pragma" "private"
       "protected" "public" "pure" "ref" "return" "scope" "shared"
-      "static" "synchronized"))
+      "static" "synchronized"
+      "@property" "@safe" "@trusted" "@system" "@nogc" "@disable"))
 
 (c-lang-defconst c-class-decl-kwds
   ;; Keywords introducing declarations where the following block (if any)
diff --git a/tests/I0093_541009399.d.html b/tests/I0093_541009399.d.html
index 47f87da..3063c02 100644
--- a/tests/I0093_541009399.d.html
+++ b/tests/I0093_541009399.d.html
@@ -2,6 +2,6 @@
 </span>
 <span class="keyword">struct</span> <span class="type">S</span>
 {
-    <span class="c-annotation-face">@safe</span>:
+    <span class="keyword">@safe</span>:
     <span class="type">T</span> <span class="variable-name">x</span>;
 }
diff --git a/tests/I0093_552200397.d.html b/tests/I0093_552200397.d.html
index d8f8843..a2a4397 100644
--- a/tests/I0093_552200397.d.html
+++ b/tests/I0093_552200397.d.html
@@ -1,4 +1,4 @@
 <span class="comment-delimiter">// </span><span class="comment">#run: 
(d-test-fontification)
 </span>
-<span class="c-annotation-face">@safe</span>:
+<span class="keyword">@safe</span>:
 <span class="keyword">class</span> <span class="type">C</span> { }
diff --git a/tests/fonts.d.html b/tests/fonts.d.html
index 5dee5df..8ae7ce7 100644
--- a/tests/fonts.d.html
+++ b/tests/fonts.d.html
@@ -23,7 +23,7 @@
 <span class="keyword">pragma</span>(<span class="constant">msg</span>, <span 
class="string">&quot;Hi!&quot;</span>);
 <span class="keyword">enum</span> <span class="variable-name">x</span> = <span 
class="constant">true</span> &amp;&amp; <span 
class="keyword">__traits</span>(<span class="constant">compiles</span>, <span 
class="constant">true</span>) &amp;&amp; <span class="constant">true</span>;
 
-<span class="c-annotation-face">@property</span> <span 
class="function-name">empty</span>() { <span class="keyword">return</span> 
<span class="constant">false</span>; }
+<span class="keyword">@property</span> <span 
class="function-name">empty</span>() { <span class="keyword">return</span> 
<span class="constant">false</span>; }
 
 <span class="keyword">auto</span> <span class="variable-name">s</span> = <span 
class="string">&quot;enum Type {}&quot;</span>;
 
diff --git a/tests/fonts_types.d.html b/tests/fonts_types.d.html
index 5856086..70c0372 100644
--- a/tests/fonts_types.d.html
+++ b/tests/fonts_types.d.html
@@ -5,7 +5,7 @@
 
 <span class="keyword">assert</span>(to<span 
class="negation-char">!</span><span class="type">string</span>(d) == to<span 
class="negation-char">!</span><span class="type">string</span>(<span 
class="type">double</span>.max));
 
-<span class="keyword">private</span> <span class="type">void</span> <span 
class="function-name">resetFile</span>(<span class="type">string</span> <span 
class="variable-name">name</span>, <span class="keyword">scope 
const</span>(<span class="type">char</span>)[] <span 
class="variable-name">stdioOpenmode</span>, <span class="type">bool</span> 
<span class="variable-name">isPopened</span>) <span 
class="c-annotation-face">@trusted</span> {}
+<span class="keyword">private</span> <span class="type">void</span> <span 
class="function-name">resetFile</span>(<span class="type">string</span> <span 
class="variable-name">name</span>, <span class="keyword">scope 
const</span>(<span class="type">char</span>)[] <span 
class="variable-name">stdioOpenmode</span>, <span class="type">bool</span> 
<span class="variable-name">isPopened</span>) <span 
class="keyword">@trusted</span> {}
 
 <span class="type">Parameter</span><span class="negation-char">!</span>(<span 
class="string">&quot;foo()&quot;</span>).<span class="type">Foo</span> <span 
class="variable-name">var</span>;