[Emacs-diffs] trunk r114482: Fix bug #15484 with link error in the --without-x configuration.

[Eli Zaretskii]

------------------------------------------------------------
revno: 114482
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15484
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2013-09-29 19:27:09 +0300
message:
  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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-09-29 16:18:55 +0000
+++ b/src/ChangeLog     2013-09-29 16:27:09 +0000
@@ -1,3 +1,8 @@
+2013-09-29  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * window.c (calc_absolute_offset): #elif should be #elif defined.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-09-28 08:19:33 +0000
+++ b/src/xdisp.c       2013-09-29 16:27:09 +0000
@@ -6955,6 +6955,7 @@
        }
     }
 
+#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 @@
          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