masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-13 23:49:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crash under -nw on macOS properly this time

Browse source 
* src/dispextern.h (FACE_COLOR_TO_PIXEL): Only use
ns_color_index_to_rgba when we're running under the NS gui
(Bug#38564).
This commit is contained in:
Robert Pluim 2019-12-29 20:41:28 +01:00
parent 9ce4207969
commit 81b697d106
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/dispextern.h
View file

@ -123,7 +123,9 @@ typedef HDC Emacs_Pix_Context;
#ifdef HAVE_NS #ifdef HAVE_NS
#include "nsgui.h" #include "nsgui.h"
#define FACE_COLOR_TO_PIXEL(face_color, frame) ns_color_index_to_rgba(face_color, frame) #define FACE_COLOR_TO_PIXEL(face_color, frame) (FRAME_NS_P (frame) \
? ns_color_index_to_rgba (face_color, frame) \
: face_color)
/* Following typedef needed to accommodate the MSDOS port, believe it or not. */ /* Following typedef needed to accommodate the MSDOS port, believe it or not. */
typedef struct ns_display_info Display_Info; typedef struct ns_display_info Display_Info;
typedef Emacs_Pixmap Emacs_Pix_Container; typedef Emacs_Pixmap Emacs_Pix_Container;