Merge from savannah/emacs-30

93ac2cb742f Fix some widgets in customize-dirlocals
42a4c847e28 Fix register-use-preview behavior with never value

2 files changed, 7 insertions, 3 deletions

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 5ce940bd0e5..e0e39b72c76 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -5992,7 +5992,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)))
@@ -6001,7 +6001,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)))
 
diff --git a/lisp/register.el b/lisp/register.el
index a338eb586d2..a955cf96232 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -582,7 +582,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))