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 078e3a8cf8eb8900c5985dbd4e25aaf8a8191c5a..1db3f4fd39442f67bd36e66e437e6a55f5bf05aa 100644 (file)
--- 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)