[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-27 9ce4207 1/2: Revert "Check for GUI frame in ns_color_index_to_r
From: |
Robert Pluim |
Subject: |
emacs-27 9ce4207 1/2: Revert "Check for GUI frame in ns_color_index_to_rgba" |
Date: |
Sun, 29 Dec 2019 15:16:04 -0500 (EST) |
branch: emacs-27
commit 9ce4207969f61476a78ba9fc3cb1fecdc3702013
Author: Robert Pluim <address@hidden>
Commit: Robert Pluim <address@hidden>
Revert "Check for GUI frame in ns_color_index_to_rgba"
This reverts commit ea84a95bd8d43612b4a424fb93de25a68ac31d05.
---
src/nsterm.m | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/src/nsterm.m b/src/nsterm.m
index 9e036aa..fbec816 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