From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sun, 20 Oct 2013 09:55:25 +0000 (+0200)
Subject: * src/nsterm.m (ns_get_color): Make selection color work for GNUStep also.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1205
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d4816ab3aadc4ce6ae090f4cbb6f78f7236e27db;p=emacs.git

* src/nsterm.m (ns_get_color): Make selection color work for GNUStep also.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index c229c50b663..48d681fed67 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
 
 	* nsterm.m (Qcocoa, Qgnustep): New variables.
 	(syms_of_nsterm): Defsym Qcocoa, Qgnustep.  Fprovide appropriate one.
+	(ns_get_color): Make selection color work for GNUStep also.
 
 2013-10-18  Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/src/nsterm.m b/src/nsterm.m
index 11aba4edd4a..5ca3ab7eed2 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1461,15 +1461,16 @@ ns_get_color (const char *name, NSColor **col)
 /*fprintf (stderr, "ns_get_color: '%s'\n", name); */
   block_input ();
 
-#ifdef NS_IMPL_COCOA
   if ([nsname isEqualToString: @"ns_selection_bg_color"])
     {
+#ifdef NS_IMPL_COCOA
       NSString *defname = [[NSUserDefaults standardUserDefaults]
                             stringForKey: @"AppleHighlightColor"];
-
       if (defname != nil)
         nsname = defname;
-      else if ((new = [NSColor selectedTextBackgroundColor]) != nil)
+      else
+#endif
+      if ((new = [NSColor selectedTextBackgroundColor]) != nil)
         {
           *col = [new colorUsingColorSpaceName: NSCalibratedRGBColorSpace];
           unblock_input ();
@@ -1495,7 +1496,6 @@ ns_get_color (const char *name, NSColor **col)
       nsname = NS_SELECTION_FG_COLOR_DEFAULT;
       name = [nsname UTF8String];
     }
-#endif // NS_IMPL_COCOA
 
   /* First, check for some sort of numeric specification. */
   hex[0] = '\0';