branch: elpa/d-mode
commit 9729d5f78c8250951e9fa1df8ec9223701171c33
Merge: 9a89656 c4d8ba8
Author: Russel Winder <[email protected]>
Commit: Russel Winder <[email protected]>
Merge pull request #62 from CyberShadow/pull-20160328-152551
Fix omission of final/abstract classes in imenu
---
d-mode.el | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/d-mode.el b/d-mode.el
index 785e0fc..a6753b0 100644
--- a/d-mode.el
+++ b/d-mode.el
@@ -470,10 +470,10 @@ operators."
(not invis))))))
(defvar d-imenu-generic-expression
- `(("*Classes*" "^\\s-*\\<class\\s-+\\([a-zA-Z0-9_]+\\)" 1)
- ("*Interfaces*" "^\\s-*\\<interface\\s-+\\([a-zA-Z0-9_]+\\)" 1)
- ("*Structs*" "^\\s-*\\<struct\\s-+\\([a-zA-Z0-9_]+\\)" 1)
- ("*Templates*"
"^\\s-*\\(?:mixin\\s-+\\)?\\<template\\s-+\\([a-zA-Z0-9_]+\\)" 1)
+ `(("*Classes*"
"^\\s-*\\(?:\\(?:final\\|abstract\\)\\s-+\\)?\\<class\\s-+\\([a-zA-Z0-9_]+\\)"
1)
+ ("*Interfaces*" "^\\s-*\\<interface\\s-+\\([a-zA-Z0-9_]+\\)" 1)
+ ("*Structs*" "^\\s-*\\<struct\\s-+\\([a-zA-Z0-9_]+\\)" 1)
+ ("*Templates*"
"^\\s-*\\(?:mixin\\s-+\\)?\\<template\\s-+\\([a-zA-Z0-9_]+\\)" 1)
(nil d-imenu-method-index-function 2)))
;;----------------------------------------------------------------------------
