Merge branch 'master' into emacs-default

Author: myTerminal

theme-looper-tests.el

@@ -51,8 +51,8 @@
 	      (theme-looper--disable-all-themes)
 	      (should (equal custom-enabled-themes
 			             '())))
-      (load-theme current-theme
-                  t))))
+      (when current-theme
+        (load-theme current-theme t)))))
 
 (ert-deftest tl-test:getting-theme-indices ()
   (let ((current-theme (car custom-enabled-themes)))
@@ -86,8 +86,8 @@
 			             'wombat)))
       (setq theme-looper--favorite-themes
 	        (custom-available-themes))
-      (load-theme current-theme
-                  t))))
+      (when current-theme
+        (load-theme current-theme t)))))
 
 (ert-deftest tl-test:setting-next-theme ()
   (let ((current-theme (car custom-enabled-themes)))
@@ -113,40 +113,36 @@
 			             '(wombat))))
       (setq theme-looper--favorite-themes
 	        (custom-available-themes))
-      (load-theme current-theme
-                  t))))
+      (when current-theme
+        (load-theme current-theme
+                    t)))))
 
 (ert-deftest tl-test:adding-customization ()
   (let ((current-theme (car custom-enabled-themes))
-	    (current-face-height (face-attribute 'default
-					                         :height)))
+	    (current-face-background (face-background 'default)))
     (unwind-protect
 	    (progn
-          (message (concatenate 'string
-                                "current-face-height: "
-                                (number-to-string current-face-height)))
-	      (theme-looper-set-favorite-themes (list 'wombat
+          (set-face-background 'default "red")
+          (message (concat "current face-background: red"))
+          (theme-looper-set-favorite-themes (list 'wombat
                                                   'tango-dark
                                                   'wheatgrass))
           ;;Should apply customizations when specified
-	      (load-theme 'tango
+          (load-theme 'tango
                       t)
-	      (theme-looper-set-post-switch-script (lambda ()
-                                                 (set-face-attribute 'default nil
-                                                                     :height 120)))
+	      (add-hook 'theme-looper-post-switch-hook
+                    (lambda ()
+                      (set-face-background 'default "green")))
 	      (theme-looper-enable-next-theme)
-	      (message (concatenate 'string
-                                "found face-height: "
-                                (number-to-string (face-attribute 'default :height))))
-	      (should (< (abs  (- (face-attribute 'default :height)
-			                  120))
-		             2)))
+	      (message (concat "found face-background: "
+                           (face-background 'default)))
+	      (should (equal (face-background 'default) "green")))
       (setq theme-looper--favorite-themes
 	        (custom-available-themes))
-      (load-theme current-theme
-                  t)
-      (set-face-attribute 'default nil
-			              :height current-face-height))))
+      (setq theme-looper-post-switch-hook nil)
+      (when current-theme
+        (load-theme current-theme t))
+      (set-face-background 'default current-face-background))))
 
 (ert-deftest tl-test:emacs-defaults ()
   (let ((current-theme (car custom-enabled-themes)))

theme-looper.el

@@ -69,9 +69,9 @@
 ;;
 ;;     (theme-looper-reset-themes-selection)
 ;;
-;; You can set some script to be run after every theme switch
+;; You can set hook functions to be run after every theme switch
 ;;
-;;     (theme-looper-set-post-switch-script my-func)
+;;     (add-hook 'theme-looper-post-switch-hook 'my-func)
 ;;
 ;; The special symbol `*default*' represents Emacs defaults (no theme)
 ;;
@@ -80,7 +80,7 @@
 ;;; Commentary:
 
 ;;     You can use this package to cycle through color themes in Emacs with a
-;;     shortcut. Select your favorite themes, unfavorite thmes and key-bindings
+;;     shortcut. Select your favorite themes, unfavorite themes and key-bindings
 ;;     to switch color themes in style!
 ;;
 ;;  Overview of features:
@@ -98,8 +98,8 @@
 (defvar theme-looper--ignored-themes
   nil)
 
-(defun theme-looper--post-switch
-    nil)
+(defvar theme-looper-post-switch-hook nil
+  "Hook that runs after selecting a theme.")
 
 (defvar theme-looper--themes-map-separator
   " | ")
@@ -142,12 +142,6 @@
                                             (symbol-name theme)))
                           (theme-looper-available-themes))))
 
-;;;###autoload
-(defun theme-looper-set-post-switch-script (func)
-  "Sets script to be run after every theme switch"
-  (setq theme-looper--post-switch
-        func))
-
 ;;;###autoload
 (defun theme-looper-reset-themes-selection ()
   "Resets themes selection back to default"
@@ -262,7 +256,7 @@ Pass `*default*' to select Emacs defaults"
   (theme-looper--disable-all-themes)
   (when (not (eq theme '*default*))
     (load-theme theme t))
-  (theme-looper--post-switch))
+  (run-hooks 'theme-looper-post-switch-hook))
 
 ;;;###autoload
 (defun theme-looper-enable-next-theme ()