Merge from emacs-24; up to 2012-11-03T05:11:34Z!dmantipov@yandex.ru

1 files changed, 18 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index be10016fc33..16b694e6e24 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,21 @@
+2012-11-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * lisp.mk: Adjust comments to the fact that term/internal is now
+        loaded from loadup.el.
+
+        * msdos.c (msdos_abort): Rename from emacs_abort, and make static.
+        (msdos_fatal_signal): New function.
+        (XMenuActivate): Adjust the call to kbd_buffer_events_waiting to
+        its argument list.
+
+        * conf_post.h (_GL_EXECINFO_INLINE) [MSDOS]: Define to "inline"
+        for GCC versions before 4.
+        (emacs_raise): Define to call msdos_fatal_signal.
+
+        * xdisp.c (init_from_display_pos): Fix initialization of the bidi
+        iterator when starting in the middle of a display or overlay
+        string.  (Bug#12745)
+
 2012-11-03  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix data-loss with --batch (Bug#9574).