procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
src/xdisp.c (get_next_display_element): Don't call face_for_font in
 a build configured --without-x.
This commit is contained in:
Eli Zaretskii 2013-09-29 19:27:09 +03:00
parent 66d13b2080
commit 92e5298bad
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -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.

2
src/xdisp.c
View file

@ -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