From: Alan Third <alan@idiocy.org>
Date: Sun, 23 Aug 2020 16:06:02 +0000 (+0100)
Subject: Silence compiler warning (bug#40845)
X-Git-Tag: emacs-28.0.90~6445
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8dc95e3598be0c20f1a192842bd2966ea342b255;p=emacs.git

Silence compiler warning (bug#40845)

* src/image.c (lookup_image): Don't allow face to be NULL.
---

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)
   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);