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

diff --git a/src/ChangeLog b/src/ChangeLog
index c229c50b663f0a4d67fbe585ca22b2b22e13e937..48d681fed672937f2568034ccab6e18c8505960b 100644 (file)
--- 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 11aba4edd4a2b6b46c08ee6b156a6f792faa77b6..5ca3ab7eed24252cee841541262732e41da70923 100644 (file)
--- 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';