mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-22 18:35:09 +00:00
Code Issues Releases Activity

Use substitute-command-keys in Helper-help

Browse Source 
* lisp/emacs-lisp/helper.el (Helper-help-scroller)
(Helper-help-options, Helper-help): Use substitute-command-keys.
(Helper-help-map): Prefer defvar-keymap.
This commit is contained in:
Stefan Kangas 2022-07-04 15:45:18 +02:00
parent a218921172
commit 0e5d790c6b
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lisp/emacs-lisp/helper.el
View File

@ -1,6 +1,6 @@
;;; helper.el --- utility help package supporting help in electric modes -*- lexical-binding: t; -*-
;; Copyright (C) 1985, 2001-2022 Free Software Foundation, Inc.
;; Copyright (C) 1985-2022 Free Software Foundation, Inc.
;; Author: K. Shane Hartman
;; Maintainer: emacs-devel@gnu.org
@ -39,19 +39,16 @@
;; keymap either.
(defvar Helper-help-map
(let ((map (make-sparse-keymap)))
;(fillarray map 'undefined)
(define-key map "m" 'Helper-describe-mode)
(define-key map "b" 'Helper-describe-bindings)
(define-key map "c" 'Helper-describe-key-briefly)
(define-key map "k" 'Helper-describe-key)
;(define-key map "f" 'Helper-describe-function)
;(define-key map "v" 'Helper-describe-variable)
(define-key map "?" 'Helper-help-options)
(define-key map (char-to-string help-char) 'Helper-help-options)
(fset 'Helper-help-map map)
map))
(defvar-keymap Helper-help-map
"m" #'Helper-describe-mode
"b" #'Helper-describe-bindings
"c" #'Helper-describe-key-briefly
"k" #'Helper-describe-key
;;"f" #'Helper-describe-function
;;"v" #'Helper-describe-variable
"?" #'Helper-help-options
(key-description (char-to-string help-char)) #'Helper-help-options)
(fset 'Helper-help-map Helper-help-map)
(defun Helper-help-scroller ()
(let ((blurb (or (and (boundp 'Helper-return-blurb)
@ -68,11 +65,13 @@
(setq state (+ (* 2 (if (pos-visible-in-window-p (point-max)) 1 0))
(if (pos-visible-in-window-p (point-min)) 1 0)))
(message
(nth state
'("Space forward, Delete back. Other keys %s"
"Space scrolls forward. Other keys %s"
"Delete scrolls back. Other keys %s"
"Type anything to %s"))
(nth state
(mapcar
#'substitute-command-keys
'("\\`SPC' forward, \\`DEL' back. Other keys %s"
"\\`SPC' scrolls forward. Other keys %s"
"\\`DEL' scrolls back. Other keys %s"
"Type anything to %s")))
blurb)
(setq continue (read-event))
(cond ((and (memq continue '(?\s ?\C-v)) (< state 2))
@ -88,8 +87,8 @@
(defun Helper-help-options ()
"Describe help options."
(interactive)
(message "c (key briefly), m (mode), k (key), b (bindings)")
;(message "c (key briefly), m (mode), k (key), v (variable), f (function)")
(message (substitute-command-keys
"\\`c' (key briefly), \\`m' (mode), \\`k' (key), \\`b' (bindings)"))
(sit-for 4))
(defun Helper-describe-key-briefly (key)
@ -142,7 +141,8 @@
(interactive)
(let ((continue t) c)
(while continue
(message "Help (Type ? for further options)")
(message (substitute-command-keys
"Help (Type \\`?' for further options)"))
(setq c (read-key-sequence nil))
(setq c (lookup-key Helper-help-map c))
(cond ((eq c 'Helper-help-options)