mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-04 11:00:45 -08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk

Browse source
This commit is contained in:
Yuuki Harano 2021-07-18 18:44:54 +09:00
commit b242394f24
137 changed files with 4819 additions and 2073 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lisp/cus-edit.el
View file

@ -1665,8 +1665,11 @@ Otherwise use brackets."
'custom-button-pressed
'custom-button-pressed-unraised))))
(defvar custom--invocation-options nil)
(defun custom-buffer-create-internal (options &optional _description)
(Custom-mode)
(setq custom--invocation-options options)
(let ((init-file (or custom-file user-init-file)))
;; Insert verbose help at the top of the custom buffer.
(when custom-buffer-verbose-help
@ -2821,7 +2824,7 @@ the present value is saved to its :shown-value property instead."
(list (widget-value
(car-safe
(widget-get widget :children)))))
(error "There are unsaved changes")))
(message "Note: There are unsaved changes")))
(widget-put widget :documentation-shown nil)
(widget-put widget :custom-state 'hidden))
(custom-redraw widget)
@ -5152,11 +5155,19 @@ if that value is non-nil."
:label (nth 5 arg)))
custom-commands)
(setq custom-tool-bar-map map))))
(setq-local custom--invocation-options nil)
(setq-local revert-buffer-function #'custom--revert-buffer)
(make-local-variable 'custom-options)
(make-local-variable 'custom-local-buffer)
(custom--initialize-widget-variables)
(add-hook 'widget-edit-functions 'custom-state-buffer-message nil t))
(defun custom--revert-buffer (_ignore-auto _noconfirm)
(unless custom--invocation-options
(error "Insufficient data to revert"))
(custom-buffer-create custom--invocation-options
(buffer-name)))
(put 'Custom-mode 'mode-class 'special)
(provide 'cus-edit)