mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-01 19:30:45 -08:00
Code Issues Projects Releases Wiki Activity

Improve regexp to match toplevel bindings

Browse source
This commit is contained in:
Iqbal Ansari 2015-10-10 18:04:02 +05:30
parent bbe4817313
commit 652af436e8
1 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
which-key.el
View file

@ -1235,11 +1235,27 @@ alists. Returns a list (key separator description)."
BUFFER that follow the key sequence KEY-SEQ."
(let* ((key-str-qt (regexp-quote (key-description which-key--current-prefix)))
(buffer (current-buffer))
;; Temporarily use tabs to indent
(indent-tabs-mode t)
(keybinding-regex (if which-key--current-prefix
(format "^%s \\([^ \t]+\\)[ \t]+\\(\\(?:[^ \t\n]+ ?\\)+\\)$"
key-str-qt)
"^\\([^ <>\t]+\\)[\t]+\\([^\n]+\\)$"))
;; For toplevel binding, we search for lines which
;; start with a sequence of characters other than
;; space and tab and '<', '>' (these are ignored
;; since mostly these are the keyboard input
;; definitions provided by iso-transl or (mouse)
;; bindings for the `fringe' or `modeline' which
;; might not be as interesting), the initial
;; sequence should be followed by one or more
;; tab/space which are then followed by a sequence
;; of non newline/tab characters
;; For example the following should match
;; C-x Prefix Command
;; But following should not
;; C-x 8 Prefix Command
;; <S-dead-acute> Prefix Command
"^\\([^ <>\t]+\\)[ \t]+\\([^\t\n]+\\)$"))
key-match desc-match unformatted)
(save-match-data
(with-temp-buffer