diff options
| author | Mauro Aranda <maurooaranda@gmail.com> | 2023-10-19 08:46:35 -0300 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2023-10-22 18:39:52 +0200 |
| commit | 5f60913208f3fb2df9a2d3bda1655e01075bf446 (patch) | |
| tree | e0dbfc8f02dccdbbe163640c7428bbccc9244c8d /lisp/emacs-lisp | |
| parent | 27c71979ff11c4a6c433f4cd6f7a390124c5fc3d (diff) | |
| download | emacs-5f60913208f3fb2df9a2d3bda1655e01075bf446.tar.gz emacs-5f60913208f3fb2df9a2d3bda1655e01075bf446.tar.bz2 emacs-5f60913208f3fb2df9a2d3bda1655e01075bf446.zip | |
Fix State button for customize-icon (Bug#66635)
* 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.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/icons.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/icons.el b/lisp/emacs-lisp/icons.el index cb08c1a6b81..9a6d26243c7 100644 --- a/lisp/emacs-lisp/icons.el +++ b/lisp/emacs-lisp/icons.el @@ -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) |