From: Robert Pluim <rpluim@gmail.com>
Date: Sun, 29 Dec 2019 19:34:20 +0000 (+0100)
Subject: Revert "Check for GUI frame in ns_color_index_to_rgba"
X-Git-Tag: emacs-27.0.90~252
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9ce4207969;p=emacs.git

Revert "Check for GUI frame in ns_color_index_to_rgba"

This reverts commit ea84a95bd8d43612b4a424fb93de25a68ac31d05.
---

diff --git a/src/nsterm.m b/src/nsterm.m
index 9e036aa1608..fbec816cccd 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -2290,24 +2290,19 @@ ns_lisp_to_color (Lisp_Object color, NSColor **col)
 
 /* Convert an index into the color table into an RGBA value.  Used in
    xdisp.c:extend_face_to_end_of_line when comparing faces and frame
-   color values.  No-op on non-gui frames.  */
+   color values.  */
 
 unsigned long
 ns_color_index_to_rgba(int idx, struct frame *f)
 {
-  if (FRAME_DISPLAY_INFO (f))
-    {
-      NSColor *col;
-      col = ns_lookup_indexed_color (idx, f);
+  NSColor *col;
+  col = ns_lookup_indexed_color (idx, f);
 
-      EmacsCGFloat r, g, b, a;
-      [col getRed: &r green: &g blue: &b alpha: &a];
+  EmacsCGFloat r, g, b, a;
+  [col getRed: &r green: &g blue: &b alpha: &a];
 
-      return ARGB_TO_ULONG((int)(a*255),
-                           (int)(r*255), (int)(g*255), (int)(b*255));
-    }
-  else
-    return idx;
+  return ARGB_TO_ULONG((int)(a*255),
+                       (int)(r*255), (int)(g*255), (int)(b*255));
 }
 
 void