merge upstream

1 files changed, 120 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 72601fe7c58..85eb113db82 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,121 @@
+2014-12-31  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Simplify setfattr use by assuming GNU make
+        * Makefile.in (PAXCTL_if_present, SETFATTR_if_present): New macros.
+        (emacs$(EXEEXT), temacs$(EXEEXT), bootstrap-emacs$(EXEEXT)): Use them.
+        Simplify by using GNU make rather than shell conditionals,
+        by using ln -f rather than rm -f followed by ln,
+        and by preferring $@ to spelling out the destination.
+
+2014-12-29  Eli Zaretskii  <eliz@gnu.org>
+
+        * sysdep.c [WINDOWSNT]: Include sys/socket.h, without which this
+        file doesn't compile on MS-Windows.
+
+2014-12-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix produce_composite_width typo
+        * term.c (produce_composite_glyph):
+        Fix typo that confused number of columns for pixel width.
+
+2014-12-28  Paul Eggert  <eggert@Penguin.CS.UCLA.EDU>
+
+        Wrap dll functions more simply
+        * decompress.c, gnutls.c, image.c, xml.c:
+        If WINDOWSNT, use '#define FOO fn_FOO' to wrap dll functions,
+        rather than the inverse when not WINDOWSNT.  This isolates the
+        fn_* business into the WINDOWSNT-specific section of the code,
+        which makes it easier to maintain the generic code.
+        * decompress.c (DEF_ZLIB_FN, LOAD_ZLIB_FN):
+        * gnutls.c (DEF_GNUTLS_FN, LOAD_GNUTLS_FN):
+        * image.c (DEF_IMGLIB_FN, LOAD_IMGLIB_FN):
+        * xml.c (DEF_XML2_FN, LOAD_XML2_FN):
+        Remove.  All uses replaced by DEF_DLL_FN.
+        * decompress.c (inflateInit2): Remove; no longer needed.
+        * w32.h (DEF_DLL_FN, LOAD_DLL_FN): New macros.
+
+        Port memory-full checking to GnuTLS 3.3
+        Instead of using gnutls_global_set_mem_functions, check every call
+        to a GnuTLS function that might return an indication of memory
+        exhaustion.  Suggested by Dmitry Antipov in:
+        http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg02056.html
+        * gnutls.c (gnutls_global_set_mem_functions) [WINDOWSNT]: Remove.
+        (init_gnutls_functions): Do not load gnutls_global_set_mem_functions.
+        (fn_gnutls_global_set_mem_functions) [!WINDOWSNT]: Remove.
+        All uses removed.
+        (check_memory_full): New function.
+        (emacs_gnutls_handshake, emacs_gnutls_handle_error)
+        (gnutls_make_error, gnutls_certificate_details, Fgnutls_peer_status)
+        (Fgnutls_boot): Use it.
+        (emacs_gnutls_global_init): Avoid gnutls_global_set_mem_functions.
+
+2014-12-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix parse_settings to match internal documentation
+        * xsettings.c (parse_settings): Return the number of settings seen.
+        Count the settings changes accurately.
+        (read_settings): Don't confuse number of settings changes with
+        the return code from XGetWindowProperty.
+
+2014-12-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (set_iterator_to_next) <GET_FROM_STRING>: Limit search in
+        composition_compute_stop_pos to the number of characters in the
+        string.  (Bug#19435)
+        <GET_FROM_BUFFER, GET_FROM_STRING>: Simplify code.
+
+        * composite.c (composition_compute_stop_pos): If no composition
+        was found in a string before ENDPOS, and ENDPOS is the string end,
+        no need to back up to a safe point.
+
+        * dispextern.h (struct it) <end_charpos>: Improve commentary.
+
+2014-12-27  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsimage.m (allocInitFromFile:): Initialize bmRep.
+        (dealloc): Release bmRep.
+        (setPixmapData): Make bmRep local so class member is not
+        set (Bug#19133).
+        (setPixmapData): Rename local variable bmRep to avoid compiler
+        warning.
+
+2014-12-27  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.c (do_ewmh_fullscreen): Don't remove maximized_horz/vert
+        when going to fullscreen (Bug#0x180004f).
+
+2014-12-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * buffer.c (syms_of_buffer) <Vafter_change_functions>: fix docstring.
+
+2014-12-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * gnutls.c (gnutls_init): Fix deprecation warning from GCC.
+
+2014-12-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use bool for boolean in xselect.c, xsettings.c
+        * xselect.c (x_get_local_selection, struct selection_data)
+        (x_selection_request_lisp_error, struct prop_location)
+        (x_handle_selection_request, x_convert_selection)
+        (waiting_for_other_props_on_window, expect_property_change)
+        (wait_for_property_change, x_handle_property_notify)
+        (x_get_foreign_selection, x_get_window_property)
+        (receive_incremental_selection)
+        (x_get_window_property_as_lisp_data)
+        (lisp_data_to_selection_data, Fx_get_selection_internal)
+        (x_send_client_event):
+        * xselect.c, xterm.h (x_handle_dnd_message):
+        * xsettings.c (dpyinfo_valid, parse_settings, read_settings)
+        (apply_xft_settings, read_and_apply_settings)
+        (xft_settings_event, init_gsettings, init_xsettings)
+        (syms_of_xsettings):
+        Use bool for boolean.
+        * xselect.c (x_get_window_property): Omit last arg, which was an
+        unused boolean.
+        * xsettings.c (apply_xft_settings): Remove 2nd arg, which was
+        always true.  All callers changed.
+
 2014-12-26  Eli Zaretskii  <eliz@gnu.org>
 
         * w32proc.c (sys_spawnve, get_lcid_callback): Use strcpy instead
@@ -894,6 +1012,8 @@
         * fileio.c (Fexpand_file_name): Use make_unibyte_string, not
         build_string, when importing a home directory.  (Bug#18873)
 
+2014-12-27  Eli Zaretskii  <eliz@gnu.org>
+
         * dispnew.c (buffer_posn_from_coords):
         Use WINDOW_WANTS_HEADER_LINE_P, not WINDOW_WANTS_MODELINE_P, to
         account for the header-line height.  (Bug#18839)