emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/d-mode 6624fcb 326/346: Unbreak indentation of access labe


From: ELPA Syncer
Subject: [nongnu] elpa/d-mode 6624fcb 326/346: Unbreak indentation of access labels
Date: Sun, 29 Aug 2021 11:00:53 -0400 (EDT)

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

    Unbreak indentation of access labels
    
    Revert an earlier fontification fix ("Fix fontification of lone
    protection labels") to fix indentation regression.
---
 d-mode.el                     | 7 ++++---
 tests/fonts_protection.d      | 2 +-
 tests/fonts_protection.d.html | 3 ++-
 tests/indent_protection.d     | 8 ++++++++
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/d-mode.el b/d-mode.el
index 9d9ee1f..21abce7 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:  202002131237
+;; Version:  202003130913
 ;; Keywords:  D programming language emacs cc-mode
 ;; Package-Requires: ((emacs "25.1"))
 
@@ -257,8 +257,9 @@ operators."
 
 (c-lang-defconst c-protection-kwds
   ;; Access protection label keywords in classes.
-  ;; Already included in c-modifier-kwds.
-  d nil)
+  d '("deprecated" "static" "extern" "final" "synchronized" "override"
+      "abstract" "scope"
+      "private" "package" "protected" "public" "export"))
 
 (c-lang-defconst c-postfix-spec-kwds
  ;Keywords introducing extra declaration specifiers in the region
diff --git a/tests/fonts_protection.d b/tests/fonts_protection.d
index bf5ff2b..c7960bc 100644
--- a/tests/fonts_protection.d
+++ b/tests/fonts_protection.d
@@ -7,4 +7,4 @@ public:
        Type var3, var4;
 }
 
-package:
+// package: // TODO!
diff --git a/tests/fonts_protection.d.html b/tests/fonts_protection.d.html
index 28da16e..e2d82be 100644
--- a/tests/fonts_protection.d.html
+++ b/tests/fonts_protection.d.html
@@ -7,4 +7,5 @@
        <span class="type">Type</span> <span class="variable-name">var3</span>, 
<span class="variable-name">var4</span>;
 }
 
-<span class="keyword">package</span>:
+<span class="comment-delimiter">// </span><span class="comment">package: // 
TODO!
+</span>
\ No newline at end of file
diff --git a/tests/indent_protection.d b/tests/indent_protection.d
new file mode 100644
index 0000000..75ac3b6
--- /dev/null
+++ b/tests/indent_protection.d
@@ -0,0 +1,8 @@
+// #run: (d-test-indent)
+
+class C
+{
+  Type var1, var2;
+public:
+  Type var3, var4;
+}



reply via email to

[Prev in Thread] Current Thread [Next in Thread]