[Emacs-diffs] master 443f171: Fix compilation --without-x

[Eli Zaretskii]

branch: master
commit 443f1719947060d87b87ee09aba7af30e75206dc
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Fix compilation --without-x
    
    * src/composite.c (autocmp_chars) [HAVE_WINDOW_SYSTEM]: Call
    font_range only if it is compiled in.  (Bug#25334)
---
 src/composite.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/composite.c b/src/composite.c
index 5e6d628..f23bb17 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -891,6 +891,8 @@ autocmp_chars (Lisp_Object rule, ptrdiff_t charpos, 
ptrdiff_t bytepos,
   if (len <= 0)
     return unbind_to (count, Qnil);
   to = limit = charpos + len;
+  font_object = win->frame;
+#ifdef HAVE_WINDOW_SYSTEM
   if (FRAME_WINDOW_P (f))
     {
       font_object = font_range (charpos, bytepos, &to, win, face, string);
@@ -900,8 +902,7 @@ autocmp_chars (Lisp_Object rule, ptrdiff_t charpos, 
ptrdiff_t bytepos,
              && (fast_looking_at (re, charpos, bytepos, to, -1, string) <= 0)))
        return unbind_to (count, Qnil);
     }
-  else
-    font_object = win->frame;
+#endif
   lgstring = Fcomposition_get_gstring (pos, make_number (to), font_object,
                                       string);
   if (NILP (LGSTRING_ID (lgstring)))