summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/crm.el
diff options
context:
space:
mode:
authorPo Lu <luangruo@yahoo.com>2024-08-09 10:12:08 +0800
committerPo Lu <luangruo@yahoo.com>2024-08-09 10:12:08 +0800
commit007ccba141ae93d05cff8e0c794a92f152657594 (patch)
tree5331caf0e8f895f6d18ba59468c39208fd9d2058 /lisp/emacs-lisp/crm.el
parent673c5e4abcb77f1e7153d84e8757401580f25cda (diff)
parenta1b8c2610a4d0cc99088c024e884495b26a17fa8 (diff)
downloademacs-007ccba141ae93d05cff8e0c794a92f152657594.tar.gz
emacs-007ccba141ae93d05cff8e0c794a92f152657594.tar.bz2
emacs-007ccba141ae93d05cff8e0c794a92f152657594.zip
Merge from savannah/emacs-30
a1b8c2610a4 * lisp/help-macro.el: Add 'help-for-help-use-variable-pit... a577eccdbbc ; * doc/lispref/strings.texi (String Conversion): Fix las... d22e52375a6 Remove manual entry for string-to-int 341e5795d5d Support minibuffer-visible-completions in completing-read... 3e30c779a70 * lisp/imenu.el (imenu-flatten): Fix doc about annotation...
Diffstat (limited to 'lisp/emacs-lisp/crm.el')
-rw-r--r--lisp/emacs-lisp/crm.el5
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/emacs-lisp/crm.el b/lisp/emacs-lisp/crm.el
index 253dfc6237a..422a8d52dcf 100644
--- a/lisp/emacs-lisp/crm.el
+++ b/lisp/emacs-lisp/crm.el
@@ -238,6 +238,11 @@ with empty strings removed."
(let* ((map (if require-match
crm-local-must-match-map
crm-local-completion-map))
+ (map (if minibuffer-visible-completions
+ (make-composed-keymap
+ (list minibuffer-visible-completions-map
+ map))
+ map))
input)
(minibuffer-with-setup-hook
(lambda ()