From: Mauro Aranda <maurooaranda@gmail.com>
Date: Sun, 1 Nov 2020 13:10:08 +0000 (-0300)
Subject: Fix saving a face setting with Customize
X-Git-Tag: emacs-28.0.90~5293
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ecec9a259b13d88fa23dde078fba99ae78ef79c7;p=emacs.git

Fix saving a face setting with Customize

* lisp/cus-edit.el (custom-face-save): Make sure we back up into the
:shown-value property what the user has edited so far, if we are going
to recreate the custom-face widget.  (Bug#44331)
---

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 769a69a50f2..3eef4468394 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -3931,7 +3931,12 @@ Optional EVENT is the location for the menu."
         (custom-face-mark-to-save widget)
       ;; The user is working on only a selected terminal type;
       ;; make sure we save the entire spec to `custom-file'. (Bug #40866)
+      ;; If recreating a widget that may have been edited by the user, remember
+      ;; to always save the edited value into the :shown-value property, so
+      ;; we use that value for the recreated widget.  (Bug#44331)
+      (widget-put widget :shown-value (custom-face-widget-to-spec widget))
       (custom-face-edit-all widget)
+      (widget-put widget :shown-value nil) ; Reset it after we used it.
       (custom-face-mark-to-save widget)
       (if (eq form 'selected)
           (custom-face-edit-selected widget)