aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorEli Zaretskii2013-09-29 19:27:09 +0300
committerEli Zaretskii2013-09-29 19:27:09 +0300
commit92e5298badf4683f345de10710b680bd1c302df5 (patch)
tree81541339ea1dd49fa4091dd878727746e77d0af8 /src/ChangeLog
parent66d13b2080af9f35a789b01db07450101957c4f7 (diff)
downloademacs-92e5298badf4683f345de10710b680bd1c302df5.tar.gz
emacs-92e5298badf4683f345de10710b680bd1c302df5.zip
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.
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog5
1 files changed, 5 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 @@
12013-09-29 Eli Zaretskii <eliz@gnu.org>
2
3 * xdisp.c (get_next_display_element): Don't call face_for_font in
4 a build configured --without-x. (Bug#15484)
5
12013-09-29 Jan Djärv <jan.h.d@swipnet.se> 62013-09-29 Jan Djärv <jan.h.d@swipnet.se>
2 7
3 * window.c (calc_absolute_offset): #elif should be #elif defined. 8 * window.c (calc_absolute_offset): #elif should be #elif defined.