From 42a4c847e286957bef579390e9cb9854699dacfd Mon Sep 17 00:00:00 2001 From: Thierry Volpiatto Date: Wed, 5 Mar 2025 10:37:03 +0100 Subject: [PATCH 1/2] Fix register-use-preview behavior with never value Allow popping up preview when pressing C-h. Don't exit the minibuffer when the call to register-read-with-preview-fancy is triggered by C-h. * lisp/register.el (register-read-with-preview-fancy): Do it. --- lisp/register.el | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/register.el b/lisp/register.el index b0ee759ec5b..373d7e54550 100644 --- a/lisp/register.el +++ b/lisp/register.el @@ -569,7 +569,11 @@ or \\='never." (setq pat input)))) (if (setq win (get-buffer-window buffer)) (with-selected-window win - (when noconfirm + (when (or (eq noconfirm t) ; Using insist + ;; Don't exit when noconfirm == (never) + ;; If we are here user has pressed C-h + ;; calling `register-preview-1'. + (memq nil noconfirm)) ;; Happen only when ;; *-use-preview == insist. (exit-minibuffer)) From 93ac2cb742f6fb90a36d758617cecb36c3d33e46 Mon Sep 17 00:00:00 2001 From: Mauro Aranda Date: Thu, 6 Mar 2025 05:45:50 -0300 Subject: [PATCH 2/2] Fix some widgets in customize-dirlocals * lisp/cus-edit.el (custom-dynamic-cons-value-create): Make sure to eval the keymap property. (Bug#76756) --- lisp/cus-edit.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 91e77c7af47..2ecae541fed 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -5918,7 +5918,7 @@ The appropriate types are: (val (car value))) (cond ((eq val 'mode) (setf (nth 1 args) - '(symbol :keymap custom-dirlocals-field-map + `(symbol :keymap ,custom-dirlocals-field-map :tag "Minor mode"))) ((eq val 'unibyte) (setf (nth 1 args) '(boolean))) ((eq val 'subdirs) (setf (nth 1 args) '(boolean))) @@ -5927,7 +5927,7 @@ The appropriate types are: (when (custom--editable-field-p w) (widget-put w :keymap custom-dirlocals-field-map)) (setf (nth 1 args) w))) - (t (setf (nth 1 args) '(sexp :keymap custom-dirlocals-field-map)))) + (t (setf (nth 1 args) `(sexp :keymap ,custom-dirlocals-field-map)))) (widget-put (nth 0 args) :keymap custom-dirlocals-field-map) (widget-group-value-create widget)))