From: Glenn Morris Date: Wed, 11 Jun 2014 19:33:14 +0000 (-0400) Subject: Merge from emacs-24; up to 2014-06-02T14:17:07Z!michael.albinus@gmx.de X-Git-Tag: emacs-25.0.90~2639^2~72 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d29d249207dbb944ea93275ea8b8ea07f59c1e82;p=emacs.git Merge from emacs-24; up to 2014-06-02T14:17:07Z!michael.albinus@gmx.de --- d29d249207dbb944ea93275ea8b8ea07f59c1e82 diff --cc doc/misc/ChangeLog index 04df41c7d9a,34209ce8438..12931661658 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@@ -1,8 -1,7 +1,12 @@@ -2014-06-10 Glenn Morris ++2014-06-11 Glenn Morris + + * Makefile.in (INFO_INSTALL): Update for 2013-08-28 DOCMISC_W32 change. + +2014-06-10 Glenn Morris + + * Makefile.in (INFO_EXT): Remove and replace by ".info" throughout. + (INFO_OPTS): Set directly rather than with configure. + 2014-06-08 Karl Berry * doc/info.texi (Help-^L): "mode line", "screenful", diff --cc doc/misc/Makefile.in index 62f50af0e43,d7562892615..4e9f8f18526 --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in @@@ -69,10 -70,10 +69,10 @@@ INFO_COMMON = ada-mode auth autotype bo mairix-el message mh-e newsticker nxml-mode octave-mode \ org pcl-cvs pgg rcirc remember reftex sasl \ sc semantic ses sieve smtpmail speedbar srecode todo-mode tramp \ - url vip viper widget wisent woman + url vhdl-mode vip viper widget wisent woman ## Info files to install on current platform. - INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_INFO_W32) + INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_W32) ## Info files to build on current platform. ## This is all of them, even though they might not all get installed, diff --cc src/ChangeLog index 6733cf176ca,3468cea6159..0e2af2d766e --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,61 -1,9 +1,67 @@@ + 2014-06-11 Eli Zaretskii + + * xdisp.c (set_cursor_from_row): Fix an off-by-one error when + matching overlay strings with 'cursor' property against buffer + positions traversed in the glyph row. (Bug#17744) + +2014-06-11 Jan Djärv + + * nsterm.h (EmacsApp): Always compile in shouldKeepRunning, isFirst + on Cocoa. + + * nsterm.m (run): Always compile for Cocoa. Use runtime check to + determine 10.9 (Bug#17751). + + * macfont.m (macfont_draw): positions where not freed. + +2014-06-10 Dmitry Antipov + + * dispextern.h (PREPARE_FACE_FOR_DISPLAY): Remove as a duplicate of ... + * xfaces.c (prepare_face_for_display) [HAVE_WINDOW_SYSTEM]: ... this + function. Also adjust comment. + * fringe.c, w32term.c, xdisp.c, xterm.c: All users changed. + + * dispextern.h (struct face) [HAVE_XFT]: Ifdef 'extra' member. + * font.c (font_done_for_face): + * xface.c (realize_non_ascii_face): Adjust user. + * font.h (struct font_driver): Convert 'prepare_face' to return + void because its return value is never used anyway. + * xfont.c (xfont_prepare_face): Return void. + * xftfont.c (xftfont_prepare_face): Likewise. Use xmalloc. + (xftfont_done_face): Use xfree. + + * dispextern.h (last_tool_bar_item): Remove declaration. + * frame.h (struct frame): New member last_tool_bar_item. + * frame.c (make_frame): Initialize it. + * xdisp.c (toplevel): Remove last_tool_bar_item. + (handle_tool_bar_click, note_tool_bar_highlight): + * w32term.c (w32_read_socket, w32_initialize): + * xterm.c (handle_one_xevent, x_initialize): Adjust users. + + * frame.h (window_system_available) [!HAVE_WINDOW_SYSTEM]: Always false. + * frame.c (window_system_available) [HAVE_WINDOW_SYSTEM]: Now here. + +2014-06-09 Paul Eggert + + Say (accept-process-output P)'s result pertains to P if P is non-nil. + * process.c (Faccept_process_output) + (wait_reading_process_output): Mention that if PROCESS is non-nil, + the return value is about PROCESS, not about other processes. + +2014-06-09 Dmitry Antipov + + Further adjustments to mark_object and friends. + Now the mark_object's stack is just 32 bytes on a 64-bit + system, which means extra 20% off the stack usage. + * alloc.c (mark_save_value): As before, refactored out from ... + (mark_object): ... adjusted user. Also add comment. + +2014-06-09 Paul Eggert + + Fix core dump after a dropped X connection (Bug#17704). + * sysdep.c (stuff_char): Don't abort merely because the selected frame + is dead, as we may be shutting down. + 2014-06-08 Glenn Morris * fileio.c (write-region-inhibit-fsync): Doc tweak.