diff options
| author | Jan Djärv | 2013-10-20 11:55:25 +0200 |
|---|---|---|
| committer | Jan Djärv | 2013-10-20 11:55:25 +0200 |
| commit | d4816ab3aadc4ce6ae090f4cbb6f78f7236e27db (patch) | |
| tree | 8483bc1f68e7e692d70e7bd9623ca91820f7a774 /src | |
| parent | 43ad632e3b9167df0234602772943913871831ff (diff) | |
| download | emacs-d4816ab3aadc4ce6ae090f4cbb6f78f7236e27db.tar.gz emacs-d4816ab3aadc4ce6ae090f4cbb6f78f7236e27db.zip | |
* src/nsterm.m (ns_get_color): Make selection color work for GNUStep also.
Diffstat (limited to 'src')
| -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 @@ | |||
| 2 | 2 | ||
| 3 | * nsterm.m (Qcocoa, Qgnustep): New variables. | 3 | * nsterm.m (Qcocoa, Qgnustep): New variables. |
| 4 | (syms_of_nsterm): Defsym Qcocoa, Qgnustep. Fprovide appropriate one. | 4 | (syms_of_nsterm): Defsym Qcocoa, Qgnustep. Fprovide appropriate one. |
| 5 | (ns_get_color): Make selection color work for GNUStep also. | ||
| 5 | 6 | ||
| 6 | 2013-10-18 Eli Zaretskii <eliz@gnu.org> | 7 | 2013-10-18 Eli Zaretskii <eliz@gnu.org> |
| 7 | 8 | ||
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) | |||
| 1461 | /*fprintf (stderr, "ns_get_color: '%s'\n", name); */ | 1461 | /*fprintf (stderr, "ns_get_color: '%s'\n", name); */ |
| 1462 | block_input (); | 1462 | block_input (); |
| 1463 | 1463 | ||
| 1464 | #ifdef NS_IMPL_COCOA | ||
| 1465 | if ([nsname isEqualToString: @"ns_selection_bg_color"]) | 1464 | if ([nsname isEqualToString: @"ns_selection_bg_color"]) |
| 1466 | { | 1465 | { |
| 1466 | #ifdef NS_IMPL_COCOA | ||
| 1467 | NSString *defname = [[NSUserDefaults standardUserDefaults] | 1467 | NSString *defname = [[NSUserDefaults standardUserDefaults] |
| 1468 | stringForKey: @"AppleHighlightColor"]; | 1468 | stringForKey: @"AppleHighlightColor"]; |
| 1469 | |||
| 1470 | if (defname != nil) | 1469 | if (defname != nil) |
| 1471 | nsname = defname; | 1470 | nsname = defname; |
| 1472 | else if ((new = [NSColor selectedTextBackgroundColor]) != nil) | 1471 | else |
| 1472 | #endif | ||
| 1473 | if ((new = [NSColor selectedTextBackgroundColor]) != nil) | ||
| 1473 | { | 1474 | { |
| 1474 | *col = [new colorUsingColorSpaceName: NSCalibratedRGBColorSpace]; | 1475 | *col = [new colorUsingColorSpaceName: NSCalibratedRGBColorSpace]; |
| 1475 | unblock_input (); | 1476 | unblock_input (); |
| @@ -1495,7 +1496,6 @@ ns_get_color (const char *name, NSColor **col) | |||
| 1495 | nsname = NS_SELECTION_FG_COLOR_DEFAULT; | 1496 | nsname = NS_SELECTION_FG_COLOR_DEFAULT; |
| 1496 | name = [nsname UTF8String]; | 1497 | name = [nsname UTF8String]; |
| 1497 | } | 1498 | } |
| 1498 | #endif // NS_IMPL_COCOA | ||
| 1499 | 1499 | ||
| 1500 | /* First, check for some sort of numeric specification. */ | 1500 | /* First, check for some sort of numeric specification. */ |
| 1501 | hex[0] = '\0'; | 1501 | hex[0] = '\0'; |