branch: elpa/d-mode
commit 2f684db85618d111fdca7fd3d3f3e1547b07d11a
Author: finalpatch <[email protected]>
Commit: finalpatch <[email protected]>
Fix deadlock in imenu generator
---
d-mode.el | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/d-mode.el b/d-mode.el
index 0e167f8..bcd221b 100644
--- a/d-mode.el
+++ b/d-mode.el
@@ -394,10 +394,9 @@ operators."
;; "return foo(x);" or "static if(x) {"
;; so we exclude type name 'static' or 'return' here
(while (let ((type (match-string 1)))
- (and type
- (or (string= type "static")
- (string= type "return")
- (string= type "new"))))
+ (and pt type
+ (save-match-data
+ (string-match (c-lang-const c-regular-keywords-regexp)
type))))
(setq pt (re-search-backward d-imenu-method-name-pattern nil t)))
pt)
;; Do not count invisible definitions.
