From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 23 Aug 2019 16:21:33 +0000 (+0300)
Subject: Fix compilation --without--x
X-Git-Tag: emacs-27.0.90~1328^2~94
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ad9c8b029c4949b492db778c40b5c94bd7093f85;p=emacs.git

Fix compilation --without--x

* src/xdisp.c (extend_face_to_end_of_line): Fix a recent
change that moved the initialization of default_face.
Reported by Glenn Morris <rgm@gnu.org>.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 41d36bd7b92..75bc536cb9f 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -20513,10 +20513,11 @@ extend_face_to_end_of_line (struct it *it)
       it->face_id = FACE_FOR_CHAR (f, face, 0, -1, Qnil);
     }
 
-#ifdef HAVE_WINDOW_SYSTEM
   /* The default face, possibly remapped. */
   struct face *default_face =
     FACE_FROM_ID (f, lookup_basic_face (it->w, f, DEFAULT_FACE_ID));
+
+#ifdef HAVE_WINDOW_SYSTEM
   if (default_face == NULL)
     error ("extend_face_to_end_of_line: default_face is not set!");