From 5f60913208f3fb2df9a2d3bda1655e01075bf446 Mon Sep 17 00:00:00 2001 From: Mauro Aranda Date: Thu, 19 Oct 2023 08:46:35 -0300 Subject: 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. --- lisp/emacs-lisp/icons.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lisp/emacs-lisp') 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) -- cgit v1.2.3