merge from trunk

1 files changed, 8 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 88df9f13762..a120cf1b182 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2013-08-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * xdisp.c (cursor_type_changed): Now static.
+
+        * image.c (imagemagick_filename_hint): New arg HINT_BUFFER.
+        Use changed.  This avoids the need to call xmalloc and for the
+        caller to call xfree, and avoids memory leaks in some situations.
+
 2013-08-14  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * xdisp.c (adjust_window_ends): Move duplicated code to new function.