diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-09-29 19:27:09 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-09-29 19:27:09 +0300 |
| commit | 92e5298badf4683f345de10710b680bd1c302df5 (patch) | |
| tree | 81541339ea1dd49fa4091dd878727746e77d0af8 | |
| parent | 66d13b2080af9f35a789b01db07450101957c4f7 (diff) | |
| download | emacs-92e5298badf4683f345de10710b680bd1c302df5.tar.gz | |
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.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xdisp.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 784388e4304..2bedb2997ac 100644 --- 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 22ada204954..d348b1cc67e 100644 --- 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 |