From: Fabián Ezequiel Gallina Date: Sat, 27 Dec 2014 16:26:58 +0000 (-0300) Subject: Merge from origin/emacs-24 X-Git-Tag: emacs-25.0.90~2631^2~15^2~15 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4b72b4f91122704b805e2696b2e9342226359de0;p=emacs.git Merge from origin/emacs-24 bef46ba Fix bad bug number reference, shall be 19427. Conflicts: src/ChangeLog --- 4b72b4f91122704b805e2696b2e9342226359de0 diff --cc src/ChangeLog index 9bc28de6813,f98afd8026f..b58714353c1 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,64 -1,13 +1,63 @@@ -2014-11-02 Jan Djärv +2014-12-27 Jan Djärv - * nsterm.h (EmacsImage): Remove imageListNext, refCount, reference, - imageListSetNext, imageListNext. + * xterm.c (do_ewmh_fullscreen): Don't remove maximized_horz/vert + when going to fullscreen (Bug#0x180004f). + - * nsimage.m (ImageList, imageListNext, imageListSetNext:) - (reference): Remove. - (allocInitFromFile:): Remove searching ImageList and calling - reference (Bug#18918). - (dealloc): Remove handling if ImageList. +2014-12-27 Stefan Monnier + + * buffer.c (syms_of_buffer) : fix docstring. + +2014-12-27 Eli Zaretskii + + * gnutls.c (gnutls_init): Fix deprecation warning from GCC. + - 2014-12-27 Eli Zaretskii - +2014-12-26 Paul Eggert + + 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 + + * w32proc.c (sys_spawnve, get_lcid_callback): Use strcpy instead + of strcat. + + * w32menu.c (add_menu_item): Use stpcpy instead of strcat. + + * w32.c (sys_readdir, stat_worker, symlink): Use strcpy instead of + strcat. + +2014-12-26 Paul Eggert + + Use bool for boolean in xsmfns.c + * xsmfns.c, xterm.h (x_session_have_connection): + * xsmfns.c (doing_interact, smc_interact_CB, Fhandle_save_session): + Use bool for boolean. + (x_session_initialize, Fhandle_save_session): + Prefer NILP (x) to EQ (x, Qnil). + +2014-12-23 Didier Verna (tiny change). + + * nsselect.m (Fns_selection_owner_p): Return a Lisp boolean, not a + C one (Bug#19396). 2014-12-22 Jan Djärv