aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRobert Pluim2019-12-29 20:41:28 +0100
committerRobert Pluim2019-12-29 21:15:34 +0100
commit81b697d1062efa039b542082b89fc0170b3db42c (patch)
treef1ccfbf041141d2b32f875d74fd70c0fd24a0481 /src
parent9ce4207969f61476a78ba9fc3cb1fecdc3702013 (diff)
downloademacs-81b697d1062efa039b542082b89fc0170b3db42c.tar.gz
emacs-81b697d1062efa039b542082b89fc0170b3db42c.zip
Fix crash under -nw on macOS properly this time
* src/dispextern.h (FACE_COLOR_TO_PIXEL): Only use ns_color_index_to_rgba when we're running under the NS gui (Bug#38564).
Diffstat (limited to 'src')
-rw-r--r--src/dispextern.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/dispextern.h b/src/dispextern.h
index 0615b16d712..4bf9f39cd08 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -123,7 +123,9 @@ typedef HDC Emacs_Pix_Context;
123 123
124#ifdef HAVE_NS 124#ifdef HAVE_NS
125#include "nsgui.h" 125#include "nsgui.h"
126#define FACE_COLOR_TO_PIXEL(face_color, frame) ns_color_index_to_rgba(face_color, frame) 126#define FACE_COLOR_TO_PIXEL(face_color, frame) (FRAME_NS_P (frame) \
127 ? ns_color_index_to_rgba (face_color, frame) \
128 : face_color)
127/* Following typedef needed to accommodate the MSDOS port, believe it or not. */ 129/* Following typedef needed to accommodate the MSDOS port, believe it or not. */
128typedef struct ns_display_info Display_Info; 130typedef struct ns_display_info Display_Info;
129typedef Emacs_Pixmap Emacs_Pix_Container; 131typedef Emacs_Pixmap Emacs_Pix_Container;