[nongnu] elpa/d-mode f7ac740 235/346: Fix imenu classification of some variables

[ELPA Syncer]

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

    Fix imenu classification of some variables
    
    Currently not reflected in the test output.
---
 d-mode.el     | 4 +---
 tests/imenu.d | 4 +++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/d-mode.el b/d-mode.el
index cc7d727..3dc6016 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:  201909092051
+;; Version:  201909092055
 ;; Keywords:  D programming language emacs cc-mode
 ;; Package-Requires: ((emacs "25.1"))
 
@@ -609,8 +609,6 @@ Each list item should be a regexp matching a single 
identifier."
                               (c-forward-syntactic-ws)
                               (char-after)))
                  (kind (cond
-                        ((eq id-prev-token nil)
-                         nil)
                         ((equal id-prev-token "enum")
                          "Enums")
                         ((equal id-prev-token "class")
diff --git a/tests/imenu.d b/tests/imenu.d
index 9325b5f..8af5f7a 100644
--- a/tests/imenu.d
+++ b/tests/imenu.d
@@ -1,5 +1,5 @@
 // #run: (d-test-get-imenu-lines)
-// #out: (4 6 11 14 17 19 22 25 33 34 37 40 43 46 49 52 54 56 67 75 78 81 84 
87 89 93 94 96 97)
+// #out: (4 6 11 14 17 19 22 25 33 34 37 40 43 46 49 52 54 56 67 75 78 81 84 
87 89 93 94 96 97 99)
 
 void foo(int x) {}
 
@@ -95,3 +95,5 @@ immutable(ubyte) bytes(){}
 
 void run(Parameter!("foo()") command) {}
 Parameter!("foo()") run(string command) {}
+
+string[string] environment;