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

Fix State button for customize-icon (Bug#66635)

Browse source 
* lisp/cus-edit.el (custom-icon-action): New function.
(custom-icon): Use it as the :action.  Otherwise, clicking the State
button is a noop.  Remove irrelevant stuff from the docstring and
comment out some copy-pasta.
(custom-icon-extended-menu): New variable, the menu to show upon
:action.
(custom-icon-set): Really redraw the widget with the new settings.
Comment out strange call to custom-variable-backup-value.
(custom-icon-save): New function.

* lisp/emacs-lisp/icons.el (icons--merge-spec): Fix call to plist-get
and avoid infloop.
This commit is contained in:
Mauro Aranda 2023-10-19 08:46:35 -03:00 • committed by Stefan Kangas
parent 27c71979ff
commit 5f60913208
2 changed files with 62 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/emacs-lisp/icons.el
View file

@ -181,9 +181,9 @@ present if the icon is represented by an image."
(let ((parent-keywords (icon-spec-keywords elem))
(current-keywords (icon-spec-keywords current)))
(while parent-keywords
(unless (plist-get (car parent-keywords) current-keywords)
(nconc current (take 2 parent-keywords))
(setq parent-keywords (cddr parent-keywords))))))))
(unless (plist-get current-keywords (car parent-keywords))
(nconc current (take 2 parent-keywords)))
(setq parent-keywords (cddr parent-keywords)))))))
merged)
(cl-defmethod icons--create ((_type (eql 'image)) icon keywords)