Merge branch 'master' into lunarized

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 ()

solarized-definitions.el

@@ -735,14 +735,14 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further."
                 (rst-level-5 (:inherit outline-5))
                 (rst-level-6 (:inherit outline-6))
                 ;;ansi-term
-                (term-color-black (,@fg-base02))
-                (term-color-red (,@fg-red))
-                (term-color-green (,@fg-green))
-                (term-color-yellow (,@fg-yellow))
-                (term-color-blue (,@fg-blue))
-                (term-color-magenta (,@fg-magenta))
-                (term-color-cyan (,@fg-cyan))
-                (term-color-white (,@fg-base00))
+                (term-color-black (,@fg-base02 ,@bg-base02))
+                (term-color-red (,@fg-red ,@bg-red))
+                (term-color-green (,@fg-green ,@bg-green))
+                (term-color-yellow (,@fg-yellow ,@bg-yellow))
+                (term-color-blue (,@fg-blue ,@bg-blue))
+                (term-color-magenta (,@fg-magenta ,@bg-magenta))
+                (term-color-cyan (,@fg-cyan ,@bg-cyan))
+                (term-color-white (,@fg-base00 ,@bg-base00))
                 ;; company
                 (company-tooltip (,@fg-base00 ,@bg-base02))
                 (company-tooltip-selection (,@fg-green ,@bg-base02))