[Emacs-diffs] trunk r117858: * nsterm.m (ns_draw_fringe_bitmap): Use the same logic as other terms to determine bitmap color. (Bug#18437)

[Alp Aker]

------------------------------------------------------------
revno: 117858
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18437
committer: Alp Aker <address@hidden>
branch nick: trunk
timestamp: Wed 2014-09-10 13:56:38 -0400
message:
  * nsterm.m (ns_draw_fringe_bitmap): Use the same logic as other terms to 
determine bitmap color.  (Bug#18437)
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsterm.m                   nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-09-10 17:51:53 +0000
+++ b/src/ChangeLog     2014-09-10 17:56:38 +0000
@@ -1,3 +1,8 @@
+2014-09-10  Alp Aker  <address@hidden>
+
+       * nsterm.m (ns_draw_fringe_bitmap): Use the same logic as other
+       terms to determine bitmap color.  (Bug#18437)
+
 2014-09-10  Eli Zaretskii  <address@hidden>
 
        * w32.c (sys_write): Use SAFE_NALLOCA for the NL -> CRLF

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2014-07-27 14:45:26 +0000
+++ b/src/nsterm.m      2014-09-10 17:56:38 +0000
@@ -2347,7 +2347,18 @@
          to erase the whole background. */
       [ns_lookup_indexed_color(face->background, f) set];
       NSRectFill (r);
-      [img setXBMColor: ns_lookup_indexed_color(face->foreground, f)];
+
+      {
+        NSColor *bm_color;
+        if (!p->cursor_p)
+          bm_color = ns_lookup_indexed_color(face->foreground, f);
+        else if (p->overlay_p)
+          bm_color = ns_lookup_indexed_color(face->background, f);
+        else
+          bm_color = f->output_data.ns->cursor_color;
+        [img setXBMColor: bm_color];
+      }
+
 #if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= 
MAC_OS_X_VERSION_10_6
       [img drawInRect: r
               fromRect: NSZeroRect