Merge d2e43b8291 into 193d29ae89

color-theme-solarized-pkg.el

@@ -1 +1 @@
-(define-package "color-theme-solarized" "%%version%%" "Solarized themes for Emacs" '((color-theme "6.5.5")))
+(define-package "color-theme-solarized" "%%version%%" "Solarized themes for Emacs")

color-theme-solarized.el

@@ -29,7 +29,7 @@ Ported to Emacs by Greg Pfeil, http://ethanschoonover.com/solarized."
    (let* ((definitions (solarized-color-definitions mode))
           (faces (first definitions))
           (variables (second definitions)))
-       (solarized-color-definitions mode)
+     (solarized-color-definitions mode)
      `(,(intern (concat "color-theme-solarized-" (symbol-name mode)))
        ,variables
        ,@faces))))
@@ -44,6 +44,7 @@ Ported to Emacs by Greg Pfeil, http://ethanschoonover.com/solarized."
   (interactive)
   (color-theme-solarized 'light))
 
+
 (add-to-list 'color-themes
              `(color-theme-solarized-light
                "Solarized Light"

solarized-definitions.el

@@ -85,14 +85,14 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further."
 
 (defun solarized-color-definitions (mode)
   (flet ((find-color (name)
-           (let ((index (if window-system
-                            (if solarized-degrade
-                                3
-			      (if solarized-broken-srgb 2 1))
-			  (if (= solarized-termcolors 256)
-			      3
-			    4))))
-             (nth index (assoc name solarized-colors)))))
+                     (let ((index (if window-system
+                                      (if solarized-degrade
+                                          3
+                                        (if solarized-broken-srgb 2 1))
+                                    (if (= solarized-termcolors 256)
+                                        3
+                                      4))))
+                       (nth index (assoc name solarized-colors)))))
     (let ((base03      (find-color 'base03))
           (base02      (find-color 'base02))
           (base01      (find-color 'base01))
@@ -144,7 +144,7 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further."
               (bg-violet `(:background ,violet))
               (bg-blue `(:background ,blue))
               (bg-cyan `(:background ,cyan))
-              
+
               (fg-base03 `(:foreground ,base03))
               (fg-base02 `(:foreground ,base02))
               (fg-base01 `(:foreground ,base01))