diff options
| author | Eli Zaretskii | 2019-08-23 19:21:33 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2019-08-23 19:21:33 +0300 |
| commit | ad9c8b029c4949b492db778c40b5c94bd7093f85 (patch) | |
| tree | 5883986f29ec8d9a9ef74ae2da4484f6ce28dd7d | |
| parent | 4b87169d113a151e5d9d6cf7b0d7cb4fb1d3d2d7 (diff) | |
| download | emacs-ad9c8b029c4949b492db778c40b5c94bd7093f85.tar.gz emacs-ad9c8b029c4949b492db778c40b5c94bd7093f85.zip | |
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>.
| -rw-r--r-- | src/xdisp.c | 3 |
1 files changed, 2 insertions, 1 deletions
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) | |||
| 20513 | it->face_id = FACE_FOR_CHAR (f, face, 0, -1, Qnil); | 20513 | it->face_id = FACE_FOR_CHAR (f, face, 0, -1, Qnil); |
| 20514 | } | 20514 | } |
| 20515 | 20515 | ||
| 20516 | #ifdef HAVE_WINDOW_SYSTEM | ||
| 20517 | /* The default face, possibly remapped. */ | 20516 | /* The default face, possibly remapped. */ |
| 20518 | struct face *default_face = | 20517 | struct face *default_face = |
| 20519 | FACE_FROM_ID (f, lookup_basic_face (it->w, f, DEFAULT_FACE_ID)); | 20518 | FACE_FROM_ID (f, lookup_basic_face (it->w, f, DEFAULT_FACE_ID)); |
| 20519 | |||
| 20520 | #ifdef HAVE_WINDOW_SYSTEM | ||
| 20520 | if (default_face == NULL) | 20521 | if (default_face == NULL) |
| 20521 | error ("extend_face_to_end_of_line: default_face is not set!"); | 20522 | error ("extend_face_to_end_of_line: default_face is not set!"); |
| 20522 | 20523 | ||