From d4816ab3aadc4ce6ae090f4cbb6f78f7236e27db Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Sun, 20 Oct 2013 11:55:25 +0200 Subject: [PATCH] * src/nsterm.m (ns_get_color): Make selection color work for GNUStep also. --- src/ChangeLog | 1 + src/nsterm.m | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) 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 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'; -- 2.39.2