Fix bug #15484 with link error in the --without-x configuration.

 src/xdisp.c (get_next_display_element): Don't call face_for_font in
 a build configured --without-x.

diff --git a/src/ChangeLog b/src/ChangeLog
index 784388e430446df9eb90a0db7cd66c1c75a7db80..2bedb2997aca31a48ead80ed456f3675501845ee 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-29  Eli Zaretskii  <eliz@gnu.org>
+
+       * xdisp.c (get_next_display_element): Don't call face_for_font in
+       a build configured --without-x.  (Bug#15484)
+
 2013-09-29  Jan Djärv  <jan.h.d@swipnet.se>
 
        * window.c (calc_absolute_offset): #elif should be #elif defined.

diff --git a/src/xdisp.c b/src/xdisp.c
index 22ada2049548f1a6ad9622f3e96e7a762b83fe54..d348b1cc67e5512f7575fb113e6362eead8852a7 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6955,6 +6955,7 @@ get_next_display_element (struct it *it)
        }
     }
 
+#ifdef HAVE_WINDOW_SYSTEM
   /* Adjust face id for a multibyte character.  There are no multibyte
      character in unibyte text.  */
   if ((it->what == IT_CHARACTER || it->what == IT_COMPOSITION)
@@ -6995,6 +6996,7 @@ get_next_display_element (struct it *it)
          it->face_id = FACE_FOR_CHAR (it->f, face, c, pos, it->string);
        }
     }
+#endif /* HAVE_WINDOW_SYSTEM */
 
  done:
   /* Is this character the last one of a run of characters with