Merge 4371d35784 into 607de3b0c7

README.md

@@ -78,6 +78,7 @@ but does include several variables that can be customized.
     -------------------------------------------
     solarized-termcolors=   16    |   256
     solarized-degrade   =   nil   |   t
+    solarized-srgb      =   t     |   nil (see details below)
     solarized-bold      =   t     |   nil
     solarized-underline =   t     |   nil
     solarized-italic    =   t     |   nil
@@ -105,6 +106,13 @@ but does include several variables that can be customized.
     For test purposes only; in GUI mode, this forces Solarized to use the 256
     degraded color mode to test the approximate color values for accuracy.
 
+*   solarized-srgb
+
+    Due to [bug #8402](http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8402),
+    emacs does not render official sRGB Solarized colors correctly on OS X.
+    This option forces Solarized to use sRGB colors instead of generic RGB
+    colors. It defaults to `nil` on Mac systems and `t` on all other platforms.
+
 *   solarized-bold | solarized-underline | solarized-italic
 
     If you wish to stop Solarized from displaying bold, underlined or 

solarized-definitions.el

@@ -44,6 +44,14 @@ in order to expand or compress the tonal range displayed."
   :options '(high normal low)
   :group 'solarized)
 
+(defcustom solarized-srgb (if (eq system-type 'darwin) nil t)
+  "Makes Solarized use Generic RGB colors when nil. Generic RGB colors
+are device-specific, but may produce better results than sRGB colors.
+This defaults to nil on Mac systems and t on all other platforms due to
+emacs bug #8402."
+  :type 'boolean
+  :group 'solarized)
+
 ;; FIXME: The Generic RGB colors will actually vary from device to device, but
 ;;        hopefully these are closer to the intended colors than the sRGB values
 ;;        that Emacs seems to dislike
@@ -74,7 +82,9 @@ in order to expand or compress the tonal range displayed."
            (let ((index (if window-system
                             (if solarized-degrade
                                 3
-			      2)
+                              (if solarized-srgb
+                                  1
+                                2))
 			  (if (= solarized-termcolors 256)
 			      3
 			    4))))