diff options
| author | Alan Third | 2020-08-23 17:06:02 +0100 |
|---|---|---|
| committer | Alan Third | 2020-08-23 17:06:02 +0100 |
| commit | 8dc95e3598be0c20f1a192842bd2966ea342b255 (patch) | |
| tree | c1ee34772eca927546faa7a08ae99d7b259f9805 /src | |
| parent | 8f42b94fe43911c6b0c7e519ba439d61459dc744 (diff) | |
| download | emacs-8dc95e3598be0c20f1a192842bd2966ea342b255.tar.gz emacs-8dc95e3598be0c20f1a192842bd2966ea342b255.zip | |
Silence compiler warning (bug#40845)
* src/image.c (lookup_image): Don't allow face to be NULL.
Diffstat (limited to 'src')
| -rw-r--r-- | src/image.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/image.c b/src/image.c index e8e3388c6bb..4933b619f66 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -2335,7 +2335,7 @@ lookup_image (struct frame *f, Lisp_Object spec, int face_id) | |||
| 2335 | EMACS_UINT hash; | 2335 | EMACS_UINT hash; |
| 2336 | 2336 | ||
| 2337 | struct face *face = (face_id >= 0) ? FACE_FROM_ID (f, face_id) | 2337 | struct face *face = (face_id >= 0) ? FACE_FROM_ID (f, face_id) |
| 2338 | : FACE_FROM_ID_OR_NULL (f, DEFAULT_FACE_ID); | 2338 | : FACE_FROM_ID (f, DEFAULT_FACE_ID); |
| 2339 | unsigned long foreground = FACE_COLOR_TO_PIXEL (face->foreground, f); | 2339 | unsigned long foreground = FACE_COLOR_TO_PIXEL (face->foreground, f); |
| 2340 | unsigned long background = FACE_COLOR_TO_PIXEL (face->background, f); | 2340 | unsigned long background = FACE_COLOR_TO_PIXEL (face->background, f); |
| 2341 | 2341 | ||