From: Glenn Morris Date: Sun, 8 Jun 2014 23:41:43 +0000 (-0700) Subject: Merge from emacs-24; up to 2014-06-02T11:35:40Z!michael.albinus@gmx.de X-Git-Tag: emacs-25.0.90~2639^2~90 X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/fd60bf6c902b47daadda6ebf442045dbe1328941 Merge from emacs-24; up to 2014-06-02T11:35:40Z!michael.albinus@gmx.de --- fd60bf6c902b47daadda6ebf442045dbe1328941 diff --cc doc/emacs/ChangeLog index daccb5a268,7c85d3a617..5d85687bd0 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@@ -1,7 -1,26 +1,29 @@@ + 2014-06-08 Glenn Morris + + * entering.texi (Entering Emacs): Small fix re initial-buffer-choice. + * misc.texi (emacsclient Options): Copyedit. + + * buffers.texi (Uniquify): Copyedits. + * files.texi (Visiting): Update for uniquify changes. + + * dired.texi (Marks vs Flags): + * rmail.texi (Rmail Scrolling): Markup fixes re SPC. + + * help.texi (Help, Misc Help): Copyedits. + + * screen.texi (Menu Bar): Copyedits. + * msdog.texi (Windows Keyboard): F10 menus are now a general feature. + + * frames.texi (Frame Commands): Copyedits re M-F10, F11. + * cmdargs.texi (Window Size X): Copyedits. + + * ack.texi (Acknowledgments): + * emacs.texi (Acknowledgments): Updates. + -2014-06-07 Glenn Morris +2014-06-08 Glenn Morris + + * ack.texi (Acknowledgments): + * emacs.texi (Acknowledgments): Updates. * programs.texi (Prettifying Symbols): Remove node. (Misc for Programs): Mention more briefly here. diff --cc doc/lispref/ChangeLog index 74557361ea,2b00d9743b..93128962c3 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@@ -1,4 -1,12 +1,12 @@@ + 2014-06-08 Glenn Morris + + * os.texi (Startup Summary): Small fix for initial-buffer-choice. + + * files.texi (Subroutines of Visiting): Mention uniquify. + + * numbers.texi (Comparison of Numbers): Copyedits. + -2014-06-06 Glenn Morris +2014-06-08 Glenn Morris * display.texi (Window Systems): Remove window-setup-hook. * os.texi (Startup Summary, Init File): diff --cc doc/misc/ChangeLog index 0bf989c75d,d1239338d2..d4bd5e43ac --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@@ -1,14 -1,25 +1,35 @@@ + 2014-06-08 Karl Berry + + * doc/info.texi (Help-^L): "mode line", "screenful", + stand-alone and Emacs Info both use the mode line. + Use x instead of weird C-x 0 to get rid of help msg + in standalone Info. + + 2014-06-08 Glenn Morris + + * vip.texi (Files): Defer to Emacs manual for uniquify details. + + * info.texi (Help-Small-Screen): Clarify details of S-SPC. + (Help-Small-Screen, Help-]): Do not mention S-SPC. + (Emacs Info Variables): Markup fix. + + * ebrowse.texi (Source Display, Finding/Viewing): + * erc.texi (Sample Session): + * ses.texi (The Basics): + * todo-mode.texi (Moving and Deleting Items): + * woman.texi (Navigation): Markup fixes re SPC, RET. + -2014-05-24 Paul Eggert +2014-06-02 Glenn Morris + + * efaq.texi (Finding a package with particular functionality): + Update example. + * vip.texi: Mention this is obsolete. + +2014-05-27 Paul Eggert + + * texinfo.tex: Update from gnulib. + +2014-05-26 Paul Eggert Specify coding if Latin-1 Emacs would misinterpret (Bug#17575). * htmlfontify.texi, org.texi: Add "coding: utf-8". diff --cc etc/ChangeLog index 2189fac6a0,3c8e94fcfc..9c2582cb0f --- a/etc/ChangeLog +++ b/etc/ChangeLog @@@ -1,4 -1,8 +1,8 @@@ + 2014-06-08 Leo Liu + + * themes/deeper-blue-theme.el: Use another fix. (Bug#17695) + -2014-06-05 Juri Linkov +2014-06-08 Juri Linkov * themes/deeper-blue-theme.el (diff-added, diff-changed, diff-removed): Set face definitions explicitly. Inherit indicator faces from them. diff --cc lisp/ChangeLog index 8010547098,ca2781b40f..2ce06f6ba5 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,4 -1,12 +1,12 @@@ + 2014-06-08 Glenn Morris + + * startup.el (initial-buffer-choice): Doc fix. + Reset :version (adding an option does not merit a :version bump). + + * bookmark.el (bookmark-load): + * uniquify.el (uniquify-buffer-name-style): Doc fixes. + -2014-06-06 Juri Linkov +2014-06-08 Juri Linkov * desktop.el: Activate auto-saving on window configuration changes. (desktop-save-mode, desktop-auto-save-timeout): Add/remove diff --cc src/ChangeLog index 72aaea5eeb,f7ee48d1d0..6f864f5eef --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,44 -1,10 +1,50 @@@ + 2014-06-08 Glenn Morris + + * fileio.c (write-region-inhibit-fsync): Doc tweak. + + * data.c (Flss, Fgtr, Fleq, Fgeq): Doc tweaks. + -2014-06-04 Eli Zaretskii +2014-06-08 Paul Eggert + + If a C name must be extern on some platforms, make it extern on all. + * dispextern.h (set_vertical_scroll_bar, erase_phys_cursor) + (load_color): + * font.h (ftxfont_driver) [HAVE_XFT]: + * keyboard.h (menu_items_inuse, ignore_mouse_drag_p, make_ctrl_char): + * lisp.h (get_frame_param): + * menu.h (tty_menu_show): + * process.h (conv_sockaddr_to_lisp, catch_child_signal): + * termhooks.h (encode_terminal_code): + * xterm.h (x_menu_wait_for_event): + Always declare. + * frame.c (get_frame_param): + * fringe.c (max_used_fringe_bitmap): + * ftxfont.c (ftxfont_driver): + * keyboard.c (ignore_mouse_drag_p, make_ctrl_char): + * menu.c (menu_items_inuse): + * process.c (conv_sockaddr_to_lisp, catch_child_signal): + * term.c (encode_terminal_code, tty_menu_show): + * xdisp.c (set_vertical_scroll_bar, erase_phys_cursor): + * xfaces.c (load_color): + * xmenu.c (x_menu_wait_for_event): + Now always extern. + +2014-06-08 Dmitry Antipov + + Change object marking routines to minimize stack usage. + This change moves a few cold paths from mark_object to NO_INLINE + functions and adjusts symbol marking loop. According to GCC 4.8.2 + -Wstack-usage, this reduces mark_object's stack usage from 80 to + 48 bytes on a 64-bit system. For a long byte-force-recompile runs, + stack usage at the mark phase is reduced up to 28%. Surprisingly, + it also gains up to 3% in speed (with default '-O2 -g3' flags). + * alloc.c (mark_compiled, mark_localized_symbol): New functions, + refactored out from ... + (mark_object): ... adjusted user. Also mark symbols in a tight + inner loop. + (mark_face_cache): Add NO_INLINE. + +2014-06-08 Eli Zaretskii * sysdep.c (reset_sys_modes): Use cursorX, not curX, as the latter contains garbage on WINDOWSNT (which could potentially infloop at