1 files changed, 17 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7342f7c6add..8fc876e248c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
+2013-01-04  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * nsterm.m (ns_draw_underwave):
+        * w32term.c (w32_draw_underwave):
+        * xterm.c (x_draw_underwave): Make underwave look more triangular
+        and also degrade gracefully for small fonts.  (Bug#13000)
+
+        * nsterm.m (ns_draw_text_decoration):
+        * w32term.c (x_draw_glyph_string):
+        * xterm.c (x_draw_glyph_string): Don't use previous underline
+        thickness and position if previous underline type is underwave.
+
+2013-01-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * fileio.c (Ffile_acl): Undocument return format.
+
 2013-01-02  Glenn Morris  <rgm@gnu.org>
 
         * keymap.c (Fkey_description): Doc fix.  (Bug#13323)
@@ -257,7 +273,7 @@
 
         * xdisp.c (select_frame_for_redisplay, ensure_selected_frame): Remove.
         (redisplay_internal): Don't bother selecting the frame to get the
-        proper value of frame-local variables.
+        proper value of frame-local variables (bug#13225).
 
 2012-12-20  Dmitry Antipov  <dmantipov@yandex.ru>