From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 6 Nov 2022 14:31:25 +0000 (+0200)
Subject: Revert "Pacify -Wnull-dereference"
X-Git-Tag: emacs-29.0.90~1616^2~260
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5233186611e9997387ade5265d4f1b1ea54395a8;p=emacs.git

Revert "Pacify -Wnull-dereference"

This reverts commit dad452552bebf832e737ebb946b5eea6cd57f63f.
Please don't assume I write such code by omission.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index ea193601b54..054adb9d9d9 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -23154,14 +23154,14 @@ extend_face_to_end_of_line (struct it *it)
      point temporarily moved to window-point.  */
   specbind (Qinhibit_quit, Qt);
   /* The default face, possibly remapped. */
-  struct face *default_face
-    = FACE_FROM_ID (f, lookup_basic_face (it->w, f, DEFAULT_FACE_ID));
-  const int extend_face_id
-    = ((it->face_id == default_face->id || it->s != NULL)
-       ? it->face_id
-       : (it->glyph_row->ends_at_zv_p
-	  ? default_face->id
-	  : face_at_pos (it, LFACE_EXTEND_INDEX)));
+  struct face *default_face =
+    FACE_FROM_ID_OR_NULL (f, lookup_basic_face (it->w, f, DEFAULT_FACE_ID));
+  const int extend_face_id =
+    (it->face_id == default_face->id || it->s != NULL)
+    ? it->face_id
+    : (it->glyph_row->ends_at_zv_p
+       ? default_face->id
+       : face_at_pos (it, LFACE_EXTEND_INDEX));
   unbind_to (count, Qnil);
 
   /* Face extension extends the background and box of IT->extend_face_id