diff options
| author | Mauro Aranda | 2021-05-10 13:33:32 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2021-05-10 13:33:32 +0200 |
| commit | 779c615f333a01d11ab930b030d61545fb048f3d (patch) | |
| tree | 493738307f960d58d525af7e1b825ec901dda12e /test/lisp/custom-resources | |
| parent | 5bedbe6b1d5f4b801abf91b4d023d5c4e66418f0 (diff) | |
| download | emacs-779c615f333a01d11ab930b030d61545fb048f3d.tar.gz emacs-779c615f333a01d11ab930b030d61545fb048f3d.zip | |
Avoid saving session customizations in the custom-file
* lisp/custom.el (custom-theme-recalc-variable): Only stash theme
settings for void variables.
(custom-declare-variable): After initializing a variable, unstash a
theme setting, if present.
(disable-theme): When disabling a theme, maybe unstash a theme
setting.
* test/lisp/custom-resources/custom--test-theme.el: Add two settings
for testing the fix.
Diffstat (limited to 'test/lisp/custom-resources')
| -rw-r--r-- | test/lisp/custom-resources/custom--test-theme.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/lisp/custom-resources/custom--test-theme.el b/test/lisp/custom-resources/custom--test-theme.el index 122bd795692..36424cdfcc3 100644 --- a/test/lisp/custom-resources/custom--test-theme.el +++ b/test/lisp/custom-resources/custom--test-theme.el | |||
| @@ -6,6 +6,8 @@ | |||
| 6 | (custom-theme-set-variables | 6 | (custom-theme-set-variables |
| 7 | 'custom--test | 7 | 'custom--test |
| 8 | '(custom--test-user-option 'bar) | 8 | '(custom--test-user-option 'bar) |
| 9 | '(custom--test-variable 'bar)) | 9 | '(custom--test-variable 'bar) |
| 10 | '(custom--test-bug-21355-before 'before) | ||
| 11 | '(custom--test-bug-21355-after 'after)) | ||
| 10 | 12 | ||
| 11 | (provide-theme 'custom--test) | 13 | (provide-theme 'custom--test) |