From 8ac71a07ce99821d8ffe41a8d6fd2261131a7261 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Thu, 12 Nov 2020 22:33:27 +0200 Subject: [PATCH] Add help-char to the cache key in read-char-from-minibuffer as well It's highly unlikely that help-char will be changed from its default value 8, but formally there is a dependence on help-char. --- lisp/subr.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/subr.el b/lisp/subr.el index cf569782ce7..04d8132eaaf 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -2771,7 +2771,7 @@ If the caller has set `help-form', there is no need to explicitly add `help-char' to chars. It's bound automatically to `help-form-show'." (let* ((empty-history '()) (map (if (consp chars) - (or (gethash (cons help-form chars) + (or (gethash (list help-form (cons help-char chars)) read-char-from-minibuffer-map-hash) (let ((map (make-sparse-keymap)) (msg help-form)) @@ -2791,7 +2791,7 @@ If the caller has set `help-form', there is no need to explicitly add 'read-char-from-minibuffer-insert-char)) (define-key map [remap self-insert-command] 'read-char-from-minibuffer-insert-other) - (puthash (cons help-form chars) + (puthash (list help-form (cons help-char chars)) map read-char-from-minibuffer-map-hash) map)) read-char-from-minibuffer-map)) -- 2.39.2