mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Revert "Add new user option 'custom-ensure-single-theme'"

Browse source 
This reverts commit b4dbf7184c.
This commit is contained in:
Philip Kaludercic 2022-09-11 13:28:36 +02:00
parent 1c1aaa0ecd
commit 3f0944c51f
No known key found for this signature in database
GPG key ID: F2C3CC513DB89F66
2 changed files with 0 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

11
etc/NEWS
View file

@ -2932,17 +2932,6 @@ These are run after enabling and disabling a theme, respectively.
Using 'make-obsolete' on a theme is now supported. This will make Using 'make-obsolete' on a theme is now supported. This will make
'load-theme' issue a warning when loading the theme. 'load-theme' issue a warning when loading the theme.
+++
*** New command 'toggle-theme'
If a theme defines a dual pair (e.g. a light or dark variant) this
command can be used disable the current one and enable the other.
---
*** New user option 'custom-ensure-single-active-theme'
If non-nil, all themes will be disabled before a new theme is enabled,
so that there is always at most one active theme at any time.
+++ +++
** New hook 'display-monitors-changed-functions'. ** New hook 'display-monitors-changed-functions'.
It is called whenever the configuration of different monitors on a It is called whenever the configuration of different monitors on a

12
lisp/custom.el
View file

@ -1280,12 +1280,6 @@ This variable cannot be set in a Custom theme."
:risky t :risky t
:version "24.1") :version "24.1")
(defcustom custom-ensure-single-active-theme nil
"Non-nil means that `load-theme' should ensure only one theme is active."
:type 'boolean
:group 'customize
:version "29.1")
(defun load-theme (theme &optional no-confirm no-enable) (defun load-theme (theme &optional no-confirm no-enable)
"Load Custom theme named THEME from its file and possibly enable it. "Load Custom theme named THEME from its file and possibly enable it.
The theme file is named THEME-theme.el, in one of the directories The theme file is named THEME-theme.el, in one of the directories
@ -1310,9 +1304,6 @@ This function is normally called through Customize when setting
should be called with a non-nil NO-CONFIRM argument, or after should be called with a non-nil NO-CONFIRM argument, or after
`custom-safe-themes' has been loaded. `custom-safe-themes' has been loaded.
If `custom-ensure-single-active-theme' is non-nil, all other active
themes will be disabled before THEME is enabled.
Return t if THEME was successfully loaded, nil otherwise." Return t if THEME was successfully loaded, nil otherwise."
(interactive (interactive
(list (list
@ -1376,9 +1367,6 @@ Return t if THEME was successfully loaded, nil otherwise."
(setq tail (cdr tail))) (setq tail (cdr tail)))
(when found (when found
(put theme 'theme-settings (cons found (delq found settings))))) (put theme 'theme-settings (cons found (delq found settings)))))
;; Check if the user only wants one theme to be active
(when custom-ensure-single-active-theme
(mapc #'disable-theme custom-enabled-themes))
;; Finally, enable the theme. ;; Finally, enable the theme.
(unless no-enable (unless no-enable
(enable-theme theme)) (enable-theme theme))