[Emacs-diffs] trunk r114726: * src/nsterm.m (ns_get_color): Make selection color work for GNUStep also.

[Jan D.]

------------------------------------------------------------
revno: 114726
revision-id: address@hidden
parent: address@hidden
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2013-10-20 11:55:25 +0200
message:
  * src/nsterm.m (ns_get_color): Make selection color work for GNUStep also.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsterm.m                   nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-10-20 08:50:34 +0000
+++ b/src/ChangeLog     2013-10-20 09:55:25 +0000
@@ -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  <address@hidden>
 

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2013-10-20 08:50:34 +0000
+++ b/src/nsterm.m      2013-10-20 09:55:25 +0000
@@ -1461,15 +1461,16 @@
 /*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 @@
       nsname = NS_SELECTION_FG_COLOR_DEFAULT;
       name = [nsname UTF8String];
     }
-#endif // NS_IMPL_COCOA
 
   /* First, check for some sort of numeric specification. */
   hex[0] = '\0';