branch: elpa/free-keys
commit f5d882d4c75d6945d8dfb67b639ab7c49114f076
Author: Matus Goljer <[email protected]>
Commit: Matus Goljer <[email protected]>
Better display of empty keys (no empty groups, fixed nil modifiers)
---
free-keys.el | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/free-keys.el b/free-keys.el
index 3c060ae630..7543bb2988 100644
--- a/free-keys.el
+++ b/free-keys.el
@@ -128,9 +128,6 @@ format recognized by `kbd', for example \"C-x\"."
(buffer-name free-keys-original-buffer)
" (major mode: " (with-current-buffer free-keys-original-buffer
(symbol-name major-mode)) ")\n\n")
(mapc (lambda (modifier)
- (if (not (equal modifier ""))
- (insert "With modifier " modifier
"\n=========================\n")
- (insert "With no modifier\n=========================\n"))
(let (empty-keys)
(mapc (lambda (key)
(let* ((key-name
@@ -138,15 +135,20 @@ format recognized by `kbd', for example \"C-x\"."
(concat modifier "-" (char-to-string key))
(char-to-string key)))
(full-name
- (if prefix (concat prefix " " key-name)
key-name))
+ (if (and prefix (not (equal prefix "")))
(concat prefix " " key-name) key-name))
(binding
(with-current-buffer free-keys-original-buffer
(key-binding (read-kbd-macro full-name)))))
(when (or (not binding)
(eq binding 'undefined))
(push full-name empty-keys))))
free-keys-keys)
- (free-keys--print-in-columns (nreverse empty-keys)))
- (insert "\n\n"))
+ (let ((len (length empty-keys)))
+ (when (> len 0)
+ (if (not (equal modifier ""))
+ (insert (format "With modifier %s (%d
free)\n=========================\n" modifier len))
+ (insert (format "With no modifier (%d
free)\n=========================\n" len)))
+ (free-keys--print-in-columns (nreverse empty-keys))
+ (insert "\n\n")))))
free-keys-modifiers)
(setq buffer-read-only t)
(make-local-variable 'buffer-read-only)
