diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2013-10-20 11:55:25 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2013-10-20 11:55:25 +0200 |
| commit | d4816ab3aadc4ce6ae090f4cbb6f78f7236e27db (patch) | |
| tree | 8483bc1f68e7e692d70e7bd9623ca91820f7a774 | |
| parent | 43ad632e3b9167df0234602772943913871831ff (diff) | |
| download | emacs-d4816ab3aadc4ce6ae090f4cbb6f78f7236e27db.tar.gz | |
* src/nsterm.m (ns_get_color): Make selection color work for GNUStep also.
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | 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 <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'; |