X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/291d430f5f184c8a9438eace09b141131de343e8..94f0aa3464955865f5abdac6b335a86aca3e180a:/src/ChangeLog?ds=sidebyside

diff --git a/src/ChangeLog b/src/ChangeLog
index ec5725af2b..08e1c7dbd7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,27 @@
+2012-06-01  Chong Yidong  <cyd@gnu.org>
+
+	* Version 24.1 released.
+
+2012-05-30  Eli Zaretskii  <eliz@gnu.org>
+
+	* xdisp.c (handle_stop): Detect whether we have overlay strings
+	loaded by testing it->current.overlay_string_index to be
+	non-negative, instead of checking whether n_overlay_strings is
+	positive.  (Bug#11587)
+
+2012-05-30  Chong Yidong  <cyd@gnu.org>
+
+	* keymap.c (describe_map_tree): Revert 2011-07-07 change (Bug#1169).
+
+	* doc.c (Fsubstitute_command_keys): Doc fix.
+
+2012-05-29  Eli Zaretskii  <eliz@gnu.org>
+
+	* search.c (search_buffer): Remove calls to
+	r_alloc_inhibit_buffer_relocation, as it is now called by
+	maybe_unify_char, which was the cause of relocation of buffer text
+	in bug#11519.
+
 2012-05-23  Eli Zaretskii  <eliz@gnu.org>
 
 	* charset.c (maybe_unify_char): Inhibit relocation of buffer text