Merge from origin/emacs-24

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index e8428abc926bf4215b06c4f01fc6cc3561a6ab67..8e72ddbf9c409d106e1fe7061b59fb813c3ebf34 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2014-12-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * buffer.c (syms_of_buffer) <Vafter_change_functions>: fix docstring.
+
+2014-12-27  Eli Zaretskii  <eliz@gnu.org>
+
+       * gnutls.c (gnutls_init): Fix deprecation warning from GCC.
+
+2014-12-27  Eli Zaretskii  <eliz@gnu.org>
+
 2014-12-26  Paul Eggert  <eggert@cs.ucla.edu>
 
        Use bool for boolean in xselect.c, xsettings.c
@@ -918,6 +928,8 @@
        * fileio.c (Fexpand_file_name): Use make_unibyte_string, not
        build_string, when importing a home directory.  (Bug#18873)
 
+2014-12-27  Eli Zaretskii  <eliz@gnu.org>
+
        * dispnew.c (buffer_posn_from_coords):
        Use WINDOW_WANTS_HEADER_LINE_P, not WINDOW_WANTS_MODELINE_P, to
        account for the header-line height.  (Bug#18839)