Merge branch 'master' into customize

2017-12-31 08:10:06 +09:00 · 2017-12-31 08:10:06 +09:00 · 4dadff03c7
parent 39c2062f31 f3ca8902ea
commit 4dadff03c7
1 changed files with 5 additions and 4 deletions
--- a/color-theme-solarized.el
+++ b/color-theme-solarized.el
@ -30,10 +30,11 @@ Ported to Emacs by Greg Pfeil, http://ethanschoonover.com/solarized."
  (color-theme-install
   `(color-theme-solarized () () ,@(solarized-color-definitions))))

-(add-to-list 'color-themes
-             `(color-theme-solarized
-               "Solarized"
-               ,solarized-description))
+(when (boundp 'color-themes)
+  (add-to-list 'color-themes
+               `(color-theme-solarized
+                 "Solarized"
+                 ,solarized-description)))

 ;;;###autoload
 (defun color-theme-solarized-dark ()