Merge from trunk.

1 files changed, 16 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5abf92bc4e1..2b6a0b2246e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2012-04-09  Paul Eggert  <eggert@cs.ucla.edu>
+2012-04-10  Paul Eggert  <eggert@cs.ucla.edu>
 
         configure: new option --enable-gcc-warnings (Bug#11207)
         * Makefile.in (C_WARNINGS_SWITCH): Remove.
@@ -11,6 +11,17 @@
         the Emacs and Gnulib regex code is merged.
         (xmalloc, xrealloc): Now static.
 
+2012-04-10  "Jason S. Cornez"  <jcornez@ravenpack.com>  (tiny change)
+
+        * keyboard.c: Override inhibit-quit after the third C-g (bug#6585).
+        (force_quit_count): New var.
+        (handle_interrupt): Use it.
+
+2012-04-10  Juanma Barranquero  <lekktu@gmail.com>
+
+        * w32.c (w32_delayed_load): Record the full path of the library
+        being loaded (bug#10424).
+
 2012-04-09  Glenn Morris  <rgm@gnu.org>
 
         * doc.c (Fsnarf_documentation): Check variables, functions are bound,
@@ -25,8 +36,8 @@
         * process.h: Add integer `gnutls_handshakes_tried' member to
         process struct.
 
-        * gnutls.h: Add `GNUTLS_EMACS_HANDSHAKES_LIMIT' upper limit.  Add
-        convenience `GNUTLS_LOG2i' macro.
+        * gnutls.h: Add `GNUTLS_EMACS_HANDSHAKES_LIMIT' upper limit.
+        Add convenience `GNUTLS_LOG2i' macro.
 
         * gnutls.c (gnutls_log_function2i): Convenience log function.
         (emacs_gnutls_read): Use new log functions,
@@ -112,8 +123,8 @@
         (xml_cleanup_parser): New function, export for fn_xmlCleanupParser.
         Calls xmlCleanupParser only if libxml2 was loaded (or statically
         linked in).
-        (Flibxml_parse_html_region, Flibxml_parse_xml_region): Call
-        init_libxml2_functions before calling libxml2 functions.
+        (Flibxml_parse_html_region, Flibxml_parse_xml_region):
+        Call init_libxml2_functions before calling libxml2 functions.
         (syms_of_xml) <Qlibxml2_dll>: DEFSYM it.
 
         * emacs.c: Don't include libxml/parser.h.