From 2ad9d73a040656b355be7f596c43009c552e68d6 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Fri, 14 Mar 2025 23:38:42 +0100 Subject: [PATCH] Use defvar-keymap in which-func.el * lisp/progmodes/which-func.el (which-func-keymap): Use defvar-keymap. (which-func-maxout): Change :type to natnum. (which-func-format): Use substitute-command-keys. (cherry picked from commit 2009ae85935beb345ce605abe398dbbe6cd84b9b) --- lisp/progmodes/which-func.el | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el index c94dfd72c4c..adfc8e439c9 100644 --- a/lisp/progmodes/which-func.el +++ b/lisp/progmodes/which-func.el @@ -105,7 +105,7 @@ If Which Function delays the initial display of buffers too much, e.g., when it is used with Eglot, and the language server takes a long time to send the information, you can use this option to delay activation of Which Function until Imenu is used for the first time." - :type 'integer) + :type 'natnum) (defcustom which-func-update-delay ;; Backwards-compatibility: if users had changed this before @@ -119,18 +119,15 @@ doing an update." :group 'display :version "30.1") -(defvar which-func-keymap - (let ((map (make-sparse-keymap))) - (define-key map [mode-line mouse-1] 'beginning-of-defun) - (define-key map [mode-line mouse-2] - (lambda () - (interactive) - (if (eq (point-min) 1) - (narrow-to-defun) - (widen)))) - (define-key map [mode-line mouse-3] 'end-of-defun) - map) - "Keymap to display on mode line which-func.") +(defvar-keymap which-func-keymap + :doc "Keymap to display on mode line which-func." + " " #'beginning-of-defun + " " (lambda () + (interactive) + (if (eq (point-min) 1) + (narrow-to-defun) + (widen))) + " " #'end-of-defun) (defface which-func ;; Whether `font-lock-function-name-face' is an appropriate face to @@ -164,11 +161,12 @@ doing an update." local-map ,which-func-keymap face which-func mouse-face mode-line-highlight - help-echo ,(concat - "Current function\n" - "mouse-1: go to beginning\n" - "mouse-2: toggle rest visibility\n" - "mouse-3: go to end")) + help-echo ,(substitute-command-keys + (concat + "Current function\n" + "\\`mouse-1': go to beginning\n" + "\\`mouse-2': toggle rest visibility\n" + "\\`mouse-3': go to end"))) "]") "Format for displaying the function in the mode line." :version "28.1" -- 2.39.5