branch: elpa/d-mode
commit b7dc06e481bc91493cdda0f78194afd9b001ccf3
Author: Vladimir Panteleev <[email protected]>
Commit: Vladimir Panteleev <[email protected]>
Fix imenu with function non-template arg list on own line
---
d-mode.el | 4 ++--
tests/imenu.d | 6 +++++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/d-mode.el b/d-mode.el
index 96ea1b9..d2eae9a 100644
--- a/d-mode.el
+++ b/d-mode.el
@@ -7,7 +7,7 @@
;; Maintainer: Russel Winder <[email protected]>
;; Vladimir Panteleev <[email protected]>
;; Created: March 2007
-;; Version: 201908262327
+;; Version: 201908262331
;; Keywords: D programming language emacs cc-mode
;; Package-Requires: ((emacs "24.3"))
@@ -564,7 +564,7 @@ Each list item should be a regexp matching a single
identifier."
;; Type arguments
(zero-or-one
"(" (zero-or-more (not (any ")"))) ")"
- (zero-or-more space))
+ (zero-or-more (any " \t\n")))
;; Arguments
"("
diff --git a/tests/imenu.d b/tests/imenu.d
index 1aac8fa..1cfee1b 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)
+// #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)
void foo(int x) {}
@@ -85,3 +85,7 @@ public alias Regex(Char) = std.regex.internal.ir.Regex!(Char);
// AtAttribute
@trusted public struct RegexMatch(R, alias Engine = ThompsonMatcher) {}
+
+string relativePath(CaseSensitive cs = CaseSensitive.osDefault)
+ (string path, lazy string base = getcwd())
+{}
