From: Eli Zaretskii Date: Mon, 8 Jun 2015 18:15:05 +0000 (+0300) Subject: Fix compilation warning/error in --without-x builds X-Git-Tag: emacs-25.0.90~1822 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=55200b4ca595cf1588fd0cefcece151ac84cb19a;p=emacs.git Fix compilation warning/error in --without-x builds * src/xdisp.c (append_space_for_newline): Condition GUI-specific code on HAVE_WINDOW_SYSTEM. --- diff --git a/src/xdisp.c b/src/xdisp.c index 14385fa8421..f0e30900043 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -19200,6 +19200,7 @@ append_space_for_newline (struct it *it, bool default_face_p) PRODUCE_GLYPHS (it); +#ifdef HAVE_WINDOW_SYSTEM /* Make sure this space glyph has the right ascent and descent values, or else cursor at end of line will look funny. */ @@ -19216,6 +19217,7 @@ append_space_for_newline (struct it *it, bool default_face_p) g->ascent = it->max_ascent; g->descent = it->max_descent; +#endif it->override_ascent = -1; it->constrain_row_ascent_descent_p = false;