>From 84dbe9924269c2c5e2fb73aadc82536e48e81820 Mon Sep 17 00:00:00 2001 From: Visuwesh Date: Fri, 13 May 2022 09:20:18 +0530 Subject: [PATCH] describe-keymap: Suggest symbol at point * lisp/help-fns.el (help-fns--most-relevant-active-keymap): Suggest the symbol at point if it is a keymap. * etc/NEWS: Announce the change. --- etc/NEWS | 5 +++++ lisp/help-fns.el | 17 +++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 273fa77640..251ebc46ce 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -363,6 +363,11 @@ These will take you (respectively) to the next and previous "page". This will take you to the Emacs Lisp manual entry for the item displayed, if any. +--- +*** 'describe-keymap' now considers the symbol at point. +'describe-keymap' suggests the symbol at point as the default +candidate if it is a keymap. + ** Outline Mode *** Support for customizing the default visibility state of headings. diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 80d7d5cb02..3836cc7367 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -1779,16 +1779,21 @@ help-fns--most-relevant-active-keymap The heuristic to determine which keymap is most likely to be relevant to a user follows this order: -1. 'keymap' text property at point -2. 'local-map' text property at point -3. the `current-local-map' +1. symbol at point +2. 'keymap' text property at point +3. 'local-map' text property at point +4. the `current-local-map' This is used to set the default value for the interactive prompt in `describe-keymap'. See also `Searching the Active Keymaps'." - (help-fns-find-keymap-name (or (get-char-property (point) 'keymap) - (if (get-text-property (point) 'local-map) + (if-let ((sym (symbol-at-point)) + (sym (when sym (intern-soft sym))) + (keymapp (ignore-errors (symbol-value sym)))) + sym + (help-fns-find-keymap-name (or (get-char-property (point) 'keymap) + (if (get-text-property (point) 'local-map) (get-char-property (point) 'local-map) - (current-local-map))))) + (current-local-map)))))) (defvar keymap-name-history nil "History for input to `describe-keymap'.") -- 2.33.1