mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-10 00:00:39 -08:00
Code Issues Projects Releases Wiki Activity

Merge from savannah/emacs-30

Browse source 
93ac2cb742 Fix some widgets in customize-dirlocals
42a4c847e2 Fix register-use-preview behavior with never value
This commit is contained in:
Po Lu 2025-03-06 21:55:41 +08:00
commit bd9ea1c7db
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/cus-edit.el
View file

@ -5992,7 +5992,7 @@ The appropriate types are:
(val (car value))) (val (car value)))
(cond (cond
((eq val 'mode) (setf (nth 1 args) ((eq val 'mode) (setf (nth 1 args)
'(symbol :keymap custom-dirlocals-field-map `(symbol :keymap ,custom-dirlocals-field-map
:tag "Minor mode"))) :tag "Minor mode")))
((eq val 'unibyte) (setf (nth 1 args) '(boolean))) ((eq val 'unibyte) (setf (nth 1 args) '(boolean)))
((eq val 'subdirs) (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) (when (custom--editable-field-p w)
(widget-put w :keymap custom-dirlocals-field-map)) (widget-put w :keymap custom-dirlocals-field-map))
(setf (nth 1 args) w))) (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-put (nth 0 args) :keymap custom-dirlocals-field-map)
(widget-group-value-create widget))) (widget-group-value-create widget)))

6
lisp/register.el
View file

@ -582,7 +582,11 @@ or \\='never."
(setq pat input)))) (setq pat input))))
(if (setq win (get-buffer-window buffer)) (if (setq win (get-buffer-window buffer))
(with-selected-window win (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 ;; Happen only when
;; *-use-preview == insist. ;; *-use-preview == insist.
(exit-minibuffer)) (exit-minibuffer))