emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 6dcfabe: Do not remove unbound variables or faces when modifying


From: Lars Ingebrigtsen
Subject: master 6dcfabe: Do not remove unbound variables or faces when modifying a custom-theme
Date: Fri, 4 Sep 2020 09:35:53 -0400 (EDT)

branch: master
commit 6dcfabea97f54c0d875b89b403a4669bfe483211
Author: Mauro Aranda <maurooaranda@gmail.com>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Do not remove unbound variables or faces when modifying a custom-theme
    
    * lisp/cus-theme.el (custom-theme-write-variables
    custom-theme-write-faces): Remove check for a bound symbol or for a
    face name, so saving a theme does not remove not yet defined variables
    or faces (bug#24727).
---
 lisp/cus-theme.el | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el
index b0decfe..dc463e0 100644
--- a/lisp/cus-theme.el
+++ b/lisp/cus-theme.el
@@ -419,14 +419,13 @@ It includes all variables in list VARS."
                            (widget-value child)
                          ;; Child is null if the widget is closed (hidden).
                          (car (widget-get widget :shown-value)))))
-           (when (boundp symbol)
-             (unless (bolp)
-               (princ "\n"))
-             (princ " '(")
-             (prin1 symbol)
-             (princ " ")
-             (prin1 (custom-quote value))
-             (princ ")")))))
+           (unless (bolp)
+             (princ "\n"))
+           (princ " '(")
+           (prin1 symbol)
+           (princ " ")
+           (prin1 (custom-quote value))
+           (princ ")"))))
       (if (bolp)
          (princ " "))
       (princ ")")
@@ -454,7 +453,7 @@ It includes all faces in list FACES."
                   ;; Child is null if the widget is closed (hidden).
                   ((widget-get widget :shown-value))
                   (t (custom-face-get-current-spec symbol)))))
-           (when (and (facep symbol) value)
+           (when value
              (princ (if (bolp) " '(" "\n '("))
              (prin1 symbol)
              (princ " ")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]