projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8f42b94
)
Silence compiler warning (bug#40845)
author
Alan Third
<alan@idiocy.org>
Sun, 23 Aug 2020 16:06:02 +0000
(17:06 +0100)
committer
Alan Third
<alan@idiocy.org>
Sun, 23 Aug 2020 16:06:02 +0000
(17:06 +0100)
* src/image.c (lookup_image): Don't allow face to be NULL.
src/image.c
patch
|
blob
|
history
diff --git
a/src/image.c
b/src/image.c
index e8e3388c6bba2a3cf28e0c84288a1e0f3dd9cced..4933b619f666ede6235dd762643d9ffc6a6432f4 100644
(file)
--- a/
src/image.c
+++ b/
src/image.c
@@
-2335,7
+2335,7
@@
lookup_image (struct frame *f, Lisp_Object spec, int face_id)
EMACS_UINT hash;
struct face *face = (face_id >= 0) ? FACE_FROM_ID (f, face_id)
- : FACE_FROM_ID
_OR_NULL
(f, DEFAULT_FACE_ID);
+ : FACE_FROM_ID (f, DEFAULT_FACE_ID);
unsigned long foreground = FACE_COLOR_TO_PIXEL (face->foreground, f);
unsigned long background = FACE_COLOR_TO_PIXEL (face->background, f);