1 files changed, 178 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 381d2ad631c..18a3d4545e3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,180 @@
+2012-04-09  Glenn Morris  <rgm@gnu.org>
+
+        * doc.c (Fsnarf_documentation): Check variables, functions are bound,
+        not just in the obarray, before snarfing them.  (Bug#11036)
+
+        * Makefile.in ($(leimdir)/leim-list.el):
+        Pass EMACS rather than BUILT_EMACS.
+
+2012-04-09  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * process.c (make_process):
+        * 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.c (gnutls_log_function2i): Convenience log function.
+        (emacs_gnutls_read): Use new log functions,
+        `gnutls_handshakes_tried' process member, and
+        `GNUTLS_EMACS_HANDSHAKES_LIMIT' to limit the number of handshake
+        attempts per process (connection).
+
+2012-04-09  Chong Yidong  <cyd@gnu.org>
+
+        * eval.c (Fuser_variable_p, user_variable_p_eh)
+        (lisp_indirect_variable): Functions deleted.
+        (Fdefvar): Caller changed.
+
+        * callint.c (Finteractive, Fcall_interactively):
+        * minibuf.c (Fread_variable): Callers changed.
+
+2012-04-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (set_cursor_from_row): If the display string appears in
+        the buffer at position that is closer to point than the position
+        after the display string, display the cursor on the first glyph of
+        the display string.  Fixes cursor display when a 'display' text
+        property immediately follows invisible text.  (Bug#11094)
+
+2012-04-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+        composite.c: use 'double' consistently
+        * composite.c (get_composition_id): Use 'double' consistently
+        instead of converting 'float' to 'double' and vice versa; this is
+        easier to understand and avoids a GCC warning.
+
+2012-04-09  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in: Generate leim-list with bootstrap-emacs, in
+        preparation for dumping it with emacs.  (Bug#4789)
+        (leimdir): New variable.
+        ($(leimdir)/leim-list.el): New rule.
+        (emacs$(EXEEXT)): Depend on leim-list.el.
+
+        * buffer.c (Qucs_set_table_for_input): Remove.  (Bug#9821)
+        (Fget_buffer_create): Don't call Qucs_set_table_for_input.
+        (init_buffer_once, syms_of_buffer): Remove Qucs_set_table_for_input.
+
+2012-04-08  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * lisp.h (struct Lisp_Symbol): Add explicit padding to ensure
+        proper alignment.
+
+2012-04-07  Juanma Barranquero  <lekktu@gmail.com>
+
+        * xml.c (init_libxml2_functions) [WINDOWSNT]:
+        Remove unused local variable.
+
+2012-04-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Avoid unnecessary pointer scanning in garbage collection (Bug#10780).
+        * alloc.c (POINTERS_MIGHT_HIDE_IN_OBJECTS): New macro.
+        (mark_memory): Mark Lisp_Objects only if pointers might hide in
+        objects, as mark_maybe_pointer will catch them otherwise.
+        (GC_LISP_OBJECT_ALIGNMENT): Remove; no longer needed.
+        * s/gnu-linux.h (GC_LISP_OBJECT_ALIGNMENT) [__mc68000__]: Likewise.
+
+2012-04-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix typo that broke non-Windows builds.
+        * xml.c (libxml2_loaded_p) [!!WINDOWSNT]: 'inine' -> 'inline'.
+
+2012-04-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Support building on MS-Windows with libxml2.
+
+        * makefile.w32-in (OBJ2): Add xml.$(O).
+        (GLOBAL_SOURCES): Add xml.c.
+        ($(BLD)/xml.$(O)): New dependency list.
+
+        * xml.c (DEF_XML2_FN, LOAD_XML2_FN) [WINDOWSNT]: New macros.
+        (fn_htmlReadMemory, fn_xmlReadMemory, fn_xmlDocGetRootElement)
+        (fn_xmlFreeDoc, fn_xmlCleanupParser, fn_xmlCheckVersion)
+        [!WINDOWSNT]: New macros.
+        (init_libxml2_functions, libxml2_loaded_p): New functions.
+        (parse_region): Call fn_xmlCheckVersion instead of using the macro
+        LIBXML_TEST_VERSION.  Call libxml2 functions via the fn_* macros.
+        (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.
+        (syms_of_xml) <Qlibxml2_dll>: DEFSYM it.
+
+        * emacs.c: Don't include libxml/parser.h.
+        (shut_down_emacs): Call xml_cleanup_parser, instead of calling
+        xmlCleanupParser directly.
+
+        * lisp.h [HAVE_LIBXML2]: Add prototype for xml_cleanup_parser.
+
+2012-04-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * indent.c (Fvertical_motion): If there is a display string at
+        point, use it.vpos to compute how many lines to backtrack after
+        move_it_to point.  (Bug#11133)
+
+2012-04-06  Eli Zaretskii  <eliz@gnu.org>
+
+        * buffer.h (FETCH_CHAR, FETCH_MULTIBYTE_CHAR):
+        * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Add comments
+        about subtle differences between FETCH_CHAR* and STRING_CHAR*
+        macros related to unification of CJK characters.  For the details,
+        see the discussion following the message here:
+        http://debbugs.gnu.org/cgi/bugreport.cgi?bug=11073#14.
+
+2012-04-04  Chong Yidong  <cyd@gnu.org>
+
+        * keyboard.c (Vdelayed_warnings_list): Doc fix.
+
+2012-04-01  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32menu.c (simple_dialog_show, add_menu_item): Use SAFE_ALLOCA
+        instead of alloca.  (Bug#11138)
+
+2012-04-01  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * w32menu.c (is_simple_dialog): Properly check lisp types.
+        (Bug#11141)
+
+2012-03-31  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (move_it_by_lines): When DVPOS is positive, and the
+        position we get to after a call to move_it_to fails the
+        IS_POS_VALID_AFTER_MOVE_P test, move to the next buffer position
+        only if we wind up in a string from display property.  (Bug#11063)
+
+        * window.c (Fdelete_other_windows_internal): Invalidate the row
+        and column information about mouse highlight, so that redisplay
+        restores it after reallocating the glyph matrices.  (Bug#7464)
+
+        * xdisp.c (set_cursor_from_row): If `cursor' property on a display
+        string comes from a `display' text property, use the buffer
+        position of that property as if we actually saw that position in
+        the row's glyphs.
+        (move_it_by_lines): Remove the assertion that
+        "it->current_x == 0 && it->hpos == 0" which can be legitimately
+        violated when there's a before-string at the beginning of a line.
+        (Bug#11063)
+
+2012-03-30  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (append_space_for_newline): If the default face was
+        remapped, use the remapped face for the appended newline.
+        (extend_face_to_end_of_line): Use the remapped default face for
+        extending the face to the end of the line.
+        (display_line): Call extend_face_to_end_of_line when the default
+        face was remapped.  (Bug#11068)
+
+2012-03-29  Eli Zaretskii  <eliz@gnu.org>
+
+        * s/ms-w32.h: Discourage from defining HAVE_GETCWD.
+
+2012-03-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keyboard.c (safe_run_hooks_error): Don't unquote strings.
+
 2012-03-27  Glenn Morris  <rgm@gnu.org>
 
         * search.c (Fword_search_backward_lax, Fword_search_forward_lax):
@@ -16,8 +193,7 @@
 
 2012-03-25  Fabrice Popineau  <fabrice.popineau@supelec.fr>
 
-        * w32heap.c (_heap_init, _heap_term): Remove dead MSVC-specific
-        code.
+        * w32heap.c (_heap_init, _heap_term): Remove dead MSVC-specific code.
 
 2012-03-25  Kenichi Handa  <handa@m17n.org>