From: Mauro Aranda <maurooaranda@gmail.com>
Date: Sun, 30 May 2021 12:35:13 +0000 (-0300)
Subject: Do not reset settings when disabling a theme
X-Git-Tag: emacs-28.0.90~2261
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=15f46b9669fe93c62b5749e3326d4124188f54cd;p=emacs.git

Do not reset settings when disabling a theme

* lisp/custom.el (disable-theme): Don't call custom-push-theme, since
that resets the theme settings and it isn't useful: we only need to
remove the theme setting from the themed variable or face.  This fixes
a regression when "toggling" themes, introduced while fixing Bug#34027.
(Bug#48736)
---

diff --git a/lisp/custom.el b/lisp/custom.el
index 078e3a8cf8e..1db3f4fd394 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -1528,7 +1528,7 @@ See `custom-enabled-themes' for a list of enabled themes."
 	(let* ((prop   (car s))
 	       (symbol (cadr s))
 	       (val (assq-delete-all theme (get symbol prop))))
-          (custom-push-theme prop symbol theme 'reset)
+          (put symbol prop val)
 	  (cond
 	   ((eq prop 'theme-value)
             (custom-theme-recalc-variable symbol)