branch: externals/which-key
commit d1dfddcd1e3eaa418daa76414109994451044cdd
Author: Henrik Lissner <accou...@v0.io>
Commit: Justin Burkett <jus...@burkett.cc>
Refactor regexp & fix incompatibility + error
---
which-key.el | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/which-key.el b/which-key.el
index 2adda88..09f5041 100644
--- a/which-key.el
+++ b/which-key.el
@@ -1671,12 +1671,17 @@ and `which-key-show-docstrings' is non-nil. If
return the docstring."
(let* ((orig-sym (intern original))
(doc (when (commandp orig-sym)
- (string-trim-left
- (documentation orig-sym)
- (concat "\\(?::"
-
"\\(?:\\(?:after\\|before\\)\\(?:-\\(?:until\\|while\\)\\)?\\|around\\|override\\|filter-\\(?:args\\|return\\)\\)"
+ (documentation orig-sym)))
+ (doc (when doc
+ (replace-regexp-in-string
+ (concat "^\\(?::"
+ (regexp-opt '("around" "override"
+ "after" "after-until" "after-while"
+ "before" "before-until" "before-while"
+ "filter-args" "filter-return"))
" advice: [^\n]+\n"
- "\\)+\n"))))
+ "\\)+\n")
+ "" doc)))
(docstring (when doc
(which-key--propertize (car (split-string doc "\n"))
'face
'which-key-docstring-face))))
