From: Glenn Morris Date: Wed, 16 Jul 2014 17:06:12 +0000 (-0400) Subject: Merge from emacs-24; up to 2014-06-23T06:25:47Z!rgm@gnu.org X-Git-Tag: emacs-25.0.90~2636^2~8 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=02a7e500e85ffe42a352a9e0c1fddd1ed6a67658;p=emacs.git Merge from emacs-24; up to 2014-06-23T06:25:47Z!rgm@gnu.org --- 02a7e500e85ffe42a352a9e0c1fddd1ed6a67658 diff --cc doc/lispintro/ChangeLog index 1ac7258e85a,c1607487b6f..70d7767635f --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@@ -1,4 -1,9 +1,9 @@@ -2014-07-15 Álvar Jesús Ibeas Martín (tiny change) ++2014-07-16 Álvar Jesús Ibeas Martín (tiny change) + + * emacs-lisp-intro.texi (Variables, Buffer Names, if & or) + (Symbols as Chest, fwd-para while): Fix typos. + -2014-06-29 Glenn Morris +2014-07-03 Glenn Morris * emacs-lisp-intro.texi (Note for Novices, Finding More, Conclusion): "Online" help doesn't mean what it used to any more. diff --cc lisp/ChangeLog index 91523424d5c,0e82c4bbc46..ac591963c0f --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,11 -1,19 +1,25 @@@ + 2014-07-16 Glenn Morris + + * desktop.el (after-init-hook): Disable startup frame restoration + in non-graphical situations. (Bug#17693) + -2014-07-14 Glenn Morris - + * vc/vc-dispatcher.el (vc-log-edit): Do set up the log buffer + if it was "empty", or used for a different set of files. (Bug#17884) + -2014-07-13 Eli Zaretskii ++2014-07-16 Eli Zaretskii + + * bindings.el (mode-line-remote): If default-directory is not a + string, don't call file-remote-p on it; instead state in the + help-echo that it is nil. (Bug#17986) + +2014-07-14 Daniel Colascione + + * progmodes/cc-langs.el: Change comments from `cl-macroexpand-all' + to `macroexpand-all' + + * progmodes/cc-defs.el (c-lang-defconst-eval-immediately): + Use `macroexpand-all' instead of `cl-macroexpand-all'. + 2014-07-12 Paul Eggert Fix bug: C-x v v discarded existing log message (Bug#17884). diff --cc src/ChangeLog index 000ddf2d877,ca31b10fb6a..1ffd1af5af3 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,103 -1,8 +1,108 @@@ -2014-07-13 Eli Zaretskii ++2014-07-16 Eli Zaretskii + + * xdisp.c (decode_mode_spec): Call file-remote-p on the current + buffer's default-directory only if it is a string. (Bug#17986) + +2014-07-16 Dmitry Antipov + + More precise control over values of some buffer-local variables. + * keyboard.c (Qvertical_scroll_bar): + * frame.c (Qleft, Qright): Move to ... + * buffer.c (Qleft, Qright, Qvertical_scroll_bar): ... here. + * buffer.c (Qchoice, Qrange, Qoverwrite_mode, Qfraction): New symbols. + (syms_of_buffer): DEFSYM all of the above, attach special properties. + Use special symbols to DEFVAR_PER_BUFFER overwrite-mode, + vertical-scroll-bar, scroll-up-aggressively + and scroll-down-aggressively. + * buffer.h (Qchoice, Qrange, Qleft, Qright, Qvertical_scroll_bar): + Add declarations. + * nsfns.m, frame.h (Qleft, Qright): + * nsterm.m (Qleft): Remove declarations. + * gtkutil.c (toplevel): Include buffer.h. + * data.c (wrong_choice, wrong_range): New functions. + (store_symval_forwarding): Handle special properties of buffer-local + variables and use functions from the above to signal error, if any. + + * frame.h (enum fullscreen_type) [HAVE_WINDOW_SYSTEM]: Use more natural + values. Add comment. + (struct frame): Re-arrange layout to avoid extra padding and use bit + fields for output_method, want_fullscreen and vertical_scroll_bar_type. + (FRAME_VERTICAL_SCROLL_BAR_TYPE, FRAME_HAS_VERTICAL_SCROLL_BARS) + (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT) + (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT) [!HAVE_WINDOW_SYSTEM]: + Define as no-ops because there are no scroll bars anyway. + * frame.c (make_frame, make_terminal_frame, make_initial_frame): + Adjust users. + + * font.c (fset_font_data) [HAVE_XFT || HAVE_FREETYPE]: + Add convenient setter. + (font_put_frame_data, font_get_frame_data): Use it. + +2014-07-15 Daiki Ueno + + * nsgui.h (XCHAR2B_BYTE1): Add missing parentheses around + pointer argument, before dereferencing. + (XCHAR2B_BYTE2): Likewise. + +2014-07-15 Dmitry Antipov + + * xmenu.c (toplevel): Use LWLIB_ID for next_menubar_widget_id. + (pop_down_menu) [USE_X_TOOLKIT]: Accept integer arg. + (create_and_show_popup_menu, create_and_show_dialog) [USE_X_TOOLKIT]: + Use record_unwind_protect_int and avoid consing. + (syms_of_xmenu) [USE_X_TOOLKIT]: Declare WIDGET_ID_TICK_START. + + * regex.c (re_search_2): Use ssize_t to avoid integer overflow. + +2014-07-14 Paul Eggert + + Use binary-io module, O_BINARY, and "b" flag (Bug#18006). + * callproc.c (create_temp_file): Use mkostemp's O_BINARY flag. + * emacs.c [MSDOS]: + * emacs.c (main) [DOS_NT]: Don't mess with _fmode. + (main) [MSDOS]: Use SET_BINARY instead of setmode. + * minibuf.c: Include binary-io.h instead of fcntl.h. + (read_minibuf_noninteractive): + Use set_binary_mode instead of handcrafted code. + Don't call emacs_set_tty if emacs_get_tty failed. + * sysdep.c, systty.h (emacs_get_tty): Return int, not void. + * sysdep.c (emacs_open, emacs_pipe): Use O_BINARY. + * w32.c (pipe2): Adjust eassert to include O_BINARY. + + * macros.c (Fstart_kbd_macro): Avoid need for overflow check. + This works around a GCC compiler bug when Emacs is configured with + --enable-gcc-warnings. + +2014-07-14 Dmitry Antipov + + * lisp.h (CHECK_VECTOR_OR_STRING): Return number of elements + or characters in string, respectively. Add comment. + * fringe.c (Fdefine_fringe_bitmap): + * fns.c (Fsubstring, substring_both): Use it. + * keymap.c (Fdefine_key, Flookup_key): + * macros.c (Fstart_kbd_macro): Likewise. Avoid call to Flength. + + * term.c (tty_menu_add_pane, tty_menu_add_selection): + Use menu_item_width. + (tty_menu_show): Simplify because tty_menu_create never return NULL. + +2014-07-13 Paul Eggert + + Improve behavior of 'bzr up; cd src; make -k'. + * Makefile.in (top_srcdir): New var. + (ntsource, lispsource, ALL_CFLAGS, gl-stamp, emacs.res): + Use '$(top_srcdir)' instead of '$(srcdir)/..'; + its expansion is a bit shorter. + (../config.status): Actually build config.status instead of + just complaining. + (ACLOCAL_INPUTS, AUTOCONF_INPUTS): + New macros, copied and relocated from ../Makefile.in. + ($(top_srcdir)/aclocal.m4, $(top_srcdir)/configure, config.in) + (../config.status, Makefile): New dependencies and rules, + copied with relocation from ../Makefile.in. This should be more + likely to rebuild the build machinery properly if you do a 'make' + in the src directory. + 2014-07-12 Eli Zaretskii * xdisp.c (display_line): Don't call FETCH_BYTE with argument less