[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 2090e5d 11/31: Add missing case for a theme that does not
From: |
Jackson Ray Hamilton |
Subject: |
[elpa] master 2090e5d 11/31: Add missing case for a theme that does not set faces. |
Date: |
Mon, 09 Feb 2015 01:09:32 +0000 |
branch: master
commit 2090e5d935b468503f6a09350946aa00ad49d0e2
Author: Jackson Ray Hamilton <address@hidden>
Commit: Jackson Ray Hamilton <address@hidden>
Add missing case for a theme that does not set faces.
---
context-coloring.el | 9 +++++----
test/context-coloring-test.el | 20 ++++++++++++++++++++
2 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/context-coloring.el b/context-coloring.el
index 4d6c172..ede7e9b 100644
--- a/context-coloring.el
+++ b/context-coloring.el
@@ -602,10 +602,11 @@ theme's author's colors instead."
(when (and defined
(not recede)
(not override))
- (context-coloring-warn-theme-defined name)))
- ;; Set (or overwrite) colors.
- (when (not recede)
- (context-coloring-apply-theme name))))))
+ (context-coloring-warn-theme-defined name))
+ ;; Set (or overwrite) colors.
+ (when (not (and defined
+ recede))
+ (context-coloring-apply-theme name)))))))
(defun context-coloring-load-theme (&optional rest)
(declare
diff --git a/test/context-coloring-test.el b/test/context-coloring-test.el
index 9b636cc..757f0d7 100644
--- a/test/context-coloring-test.el
+++ b/test/context-coloring-test.el
@@ -470,6 +470,26 @@ t for a theme with SETTINGS."
:colors '("#cccccc"
"#dddddd"))
(context-coloring-test-assert-no-message "*Warnings*")
+ (context-coloring-test-assert-face 0 "#aaaaaa")
+ (context-coloring-test-assert-face 1 "#bbbbbb")
+ (enable-theme theme)
+ (context-coloring-test-assert-no-message "*Warnings*")
+ (context-coloring-test-assert-face 0 "#aaaaaa")
+ (context-coloring-test-assert-face 1 "#bbbbbb"))
+
+(context-coloring-test-deftest-define-theme post-recede-not-defined
+ (context-coloring-test-deftheme theme)
+ (custom-theme-set-faces
+ theme
+ '(foo-face ((t (:foreground "#ffffff")))))
+ (context-coloring-define-theme
+ theme
+ :recede t
+ :colors '("#aaaaaa"
+ "#bbbbbb"))
+ (context-coloring-test-assert-no-message "*Warnings*")
+ (context-coloring-test-assert-face 0 "#aaaaaa")
+ (context-coloring-test-assert-face 1 "#bbbbbb")
(enable-theme theme)
(context-coloring-test-assert-no-message "*Warnings*")
(context-coloring-test-assert-face 0 "#aaaaaa")
- [elpa] master 06efd73 09/31: Fix assertion so tests fail., (continued)
- [elpa] master 06efd73 09/31: Fix assertion so tests fail., Jackson Ray Hamilton, 2015/02/08
- [elpa] master 23a12b8 12/31: Rename test., Jackson Ray Hamilton, 2015/02/08
- [elpa] master 06a7606 10/31: Pass / update tests for warnings., Jackson Ray Hamilton, 2015/02/08
- [elpa] master 6e6bc61 15/31: Rename themep to theme-p., Jackson Ray Hamilton, 2015/02/08
- [elpa] master 0f036c9 13/31: Improve documentation for themes., Jackson Ray Hamilton, 2015/02/08
- [elpa] master ca7122c 16/31: Remove `when'., Jackson Ray Hamilton, 2015/02/08
- [elpa] master 71a1a0c 14/31: Rename ambiguous "defined" to "originally set"., Jackson Ray Hamilton, 2015/02/08
- [elpa] master c4459fe 02/31: Fix faces on light tty backgrounds. Be more conservative about applying themes., Jackson Ray Hamilton, 2015/02/08
- [elpa] master cda491a 17/31: Long lines., Jackson Ray Hamilton, 2015/02/08
- [elpa] master 807f484 03/31: Allow themes to be overridden, but warn., Jackson Ray Hamilton, 2015/02/08
- [elpa] master 2090e5d 11/31: Add missing case for a theme that does not set faces.,
Jackson Ray Hamilton <=
- [elpa] master 6eef78b 21/31: Add spacegray theme., Jackson Ray Hamilton, 2015/02/08
- [elpa] master 2b687ae 19/31: Pass test for disabling., Jackson Ray Hamilton, 2015/02/08
- [elpa] master a197a8c 20/31: Add disclaimer about precedence., Jackson Ray Hamilton, 2015/02/08
- [elpa] master 9d55bd6 18/31: Generalize assertions. Write failing test for disabling., Jackson Ray Hamilton, 2015/02/08
- [elpa] master 3bd7e26 22/31: Add anti-zenburn theme., Jackson Ray Hamilton, 2015/02/08
- [elpa] master 35b3e71 23/31: Add ample theme., Jackson Ray Hamilton, 2015/02/08
- [elpa] master 0b42ae1 24/31: Add grandshell theme., Jackson Ray Hamilton, 2015/02/08
- [elpa] master 0b8d03d 25/31: Update readme., Jackson Ray Hamilton, 2015/02/08
- [elpa] master fb14816 26/31: Update readme., Jackson Ray Hamilton, 2015/02/08
- [elpa] master c2b6999 29/31: Version 5.0.0., Jackson Ray Hamilton, 2015/02/08