[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 8dc95e3: Silence compiler warning (bug#40845)
From: |
Alan Third |
Subject: |
master 8dc95e3: Silence compiler warning (bug#40845) |
Date: |
Sun, 23 Aug 2020 12:07:20 -0400 (EDT) |
branch: master
commit 8dc95e3598be0c20f1a192842bd2966ea342b255
Author: Alan Third <alan@idiocy.org>
Commit: Alan Third <alan@idiocy.org>
Silence compiler warning (bug#40845)
* src/image.c (lookup_image): Don't allow face to be NULL.
---
src/image.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/image.c b/src/image.c
index e8e3388..4933b61 100644
--- 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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 8dc95e3: Silence compiler warning (bug#40845),
Alan Third <=