From: Glenn Morris Date: Mon, 8 Sep 2014 06:00:58 +0000 (-0700) Subject: Merge from emacs-24; up to 2014-07-08T06:24:07Z!eggert@cs.ucla.edu X-Git-Tag: emacs-25.0.90~2635^2~679^2~332 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c04714f7c87956eb49e803d69290793f15fdaa90;p=emacs.git Merge from emacs-24; up to 2014-07-08T06:24:07Z!eggert@cs.ucla.edu --- c04714f7c87956eb49e803d69290793f15fdaa90 diff --cc admin/ChangeLog index bbb673beddf,48d7a211a76..4ebf97d3163 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@@ -1,65 -1,12 +1,73 @@@ -2014-09-03 Eli Zaretskii ++2014-09-08 Eli Zaretskii + + * unidata/unidata-gen.el (unidata-check): Bring this function up + to date with the currently supported methods of generating Unicode + property tables. Add a comment with a description how to invoke + the check. Update the copyright years in the reference to the + Unicode data files we use. + -2014-06-24 Eli Zaretskii +2014-08-30 Paul Eggert + + Vector-sorting fixes (Bug#18361). + * merge-gnulib (GNULIB_MODULES): Add vla. + +2014-08-30 Eli Zaretskii + + * authors.el (authors): Fix last change so it works for MS-Windows + as well. + +2014-08-29 Michael Albinus + + * authors.el (authors): Use LOCALE argument of `string-collate-lessp'. + +2014-08-28 Michael Albinus + + * authors.el (authors-aliases): Addition. + +2014-08-26 Glenn Morris + + * authors.el (authors-ignored-files, authors-valid-file-names) + (authors-renamed-files-alist): Additions. + (authors-renamed-files-alist): Revert 2014-08-09 change. + (authors): Sort authors in utf-8 order. (Bug#2263) + +2014-08-09 Reuben Thomas + + * notes/copyright: Remove mention of msdos/is_exec.c and + sigaction.c. + * authors.el (authors-renamed-files-alist): Removed is_exec.c. + +2014-08-07 Reuben Thomas + + * notes/exit-value: Remove specific discussion of VMS. + +2014-08-07 Reuben Thomas + + Refer to MS-DOS using the same name everywhere. + + * FOR-RELEASE: ``MS-DOG'', ``MSDOG'' and ``msdog'' become + ``MS-DOS''. + * MAINTAINERS: ditto. + +2014-07-14 Paul Eggert + + Use binary-io module, O_BINARY, and "b" flag (Bug#18006). + * merge-gnulib (GNULIB_MODULES): Add binary-io. It was already + present implicitly; this just makes the dependence explicit. + +2014-06-30 Glenn Morris + + * update_autogen: Find loaddefs targets rather than + parsing lisp/Makefile.in + +2014-06-29 Glenn Morris + + * update_autogen: Remove need to cd into/out of lisp/. + + * grammars/Makefile.in (bootstrap-clean): Don't delete Makefile, + for sake of top-level maintainer-clean rule. + +2014-06-26 Eli Zaretskii * notes/unicode: Some notes about what to do when a new Unicode version is imported. diff --cc doc/lispref/ChangeLog index 185e5045be7,e8efcaa923c..ddd0dee213a --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@@ -1,21 -1,9 +1,26 @@@ -2014-09-04 Stefan Monnier ++2014-09-08 Stefan Monnier + + * functions.texi (Core Advising Primitives): Add a note about the + confusing treatment of `interactive' for :filter-args (bug#18399). + -2014-08-19 Eli Zaretskii +2014-09-07 Michael Albinus + + * strings.texi (Text Comparison): Describe `string-collate-equalp' + and `string-collate-lessp'. + +2014-09-06 Leo Liu + + * control.texi (Pattern matching case statement): Document vector + qpattern. (Bug#18327) + +2014-08-29 Dmitry Antipov + + * lists.texi (Functions that Rearrange Lists): Remove + description of sort ... + * sequences.texi (Sequence Functions): ... and generalize + it for sequences. Add an example. + +2014-08-28 Eli Zaretskii * display.texi (Bidirectional Display): Update the Emacs's class of bidirectional conformance. diff --cc lisp/ChangeLog index c96c67fda99,2bd234e12e0..292156db155 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,83 -1,22 +1,101 @@@ + 2014-09-08 Glenn Morris + + * calendar/calendar.el (calendar-basic-setup): + Avoid clobbering calendar with diary. (Bug#18381) + -2014-09-05 Stefan Monnier ++2014-09-08 Stefan Monnier + + * vc/vc-dir.el (vc-dir-update): Don't burp in corner case. + -2014-09-04 Lars Ljung (tiny change) ++2014-09-08 Lars Ljung (tiny change) + + * isearch.el (isearch-yank-word-or-char): Obey superword-mode + as well (bug#18400). + -2014-09-04 Eli Zaretskii ++2014-09-08 Eli Zaretskii + + * subr.el (posn-actual-col-row): Doc fix. (Bug#18385) + -2014-09-02 Stefan Monnier +2014-09-06 Leo Liu + + * emacs-lisp/pcase.el (pcase): Doc fix. + (pcase--split-vector): New function. + (pcase--q1): Support vector qpattern. (Bug#18327) + +2014-09-05 Sam Steingold + + * textmodes/tex-mode.el (tex-print-file-extension): New user + option. + (tex-print): Use it instead of the hard-coded string. + +2014-09-05 Michael Albinus + + * net/tramp-sh.el (tramp-sh-handle-start-file-process): + Expand `default-directory'. + +2014-09-05 Martin Rudalics + + * scroll-bar.el (horizontal-scroll-bars-available-p): New + function. + (horizontal-scroll-bar-mode): Rewrite using + horizontal-scroll-bars-available-p. + * menu-bar.el (menu-bar-showhide-scroll-bar-menu): Rewrite using + horizontal-scroll-bars-available-p. + +2014-09-05 Stefan Monnier + + * subr.el (call-process-shell-command, process-file-shell-command): + Make the `args' obsolete (bug#18409). + (start-process-shell-command, start-file-process-shell-command): + Use `declare'. + +2014-09-05 Jay Belanger + + * calc/calc-forms.el (math-normalize-hms): Do a better check for + "negative" hms forms. + +2014-09-04 Rasmus Pank Roulund + + * vc/vc-git.el (vc-git-conflicted-files): Fix bug when git status + returns nil (bug#18391). + +2014-09-04 Stefan Monnier + + * emacs-lisp/eldoc.el (eldoc-function-argstring): Don't strip + terminating paren (bug#18352). + (eldoc-last-data-store): Return cached data. + (eldoc-get-var-docstring): Avoid setq. + (eldoc-get-fnsym-args-string): Clarify data flow. + +2014-09-04 Thierry Volpiatto + + * emacs-lisp/eldoc.el (eldoc-highlight-function-argument): Handle the + case where we're currently providing part of the &rest arg after some + &key args, as in define-ibuffer-op (bug#18048). + +2014-09-03 Stefan Monnier + + * progmodes/which-func.el (which-func-ff-hook): Obey pre-existing + buffer-local setting of which-func-mode. + (which-func-mode): Use defvar-local. + (which-function-mode): Don't reset which-func-mode in each buffer since + it might have been set by someone else. + (which-func-update-ediff-windows): Check which-function-mode. + +2014-09-03 Martin Rudalics + + * frame.el (frame-initialize): Remove horizontal-scroll-bars + from frame-initial-frame-alist. + * scroll-bar.el (previous-horizontal-scroll-bar-mode) + (horizontal-scroll-bar-mode-explicit) + (set-horizontal-scroll-bar-mode, get-horizontal-scroll-bar-mode) + (toggle-horizontal-scroll-bar): Remove. + (horizontal-scroll-bar-mode): Remove defcustom. + (horizontal-scroll-bar-mode): Fix doc-string. + (scroll-bar-toolkit-scroll) + (scroll-bar-toolkit-horizontal-scroll): Add doc-strings stubs. + +2014-09-03 Stefan Monnier * emacs-lisp/package.el (package-generate-description-file): Properly quote the arguments (bug#18332). Change second arg. diff --cc src/ChangeLog index 2654abd32d4,e834a2cc161..4e01e155c2e --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,169 -1,16 +1,179 @@@ -2014-09-07 Eli Zaretskii ++2014-09-08 Eli Zaretskii + + * dispnew.c (prepare_desired_row): When MODE_LINE_P is zero, + always make sure the marginal areas of the row are in sync with + what the window wants. (Bug#18419) + -2014-09-04 Eli Zaretskii - + * data.c (set_internal): Use assq_no_quit, not Fassq, to find an + existing binding of a variable, to avoid silently aborting + commands that use specbind. (Bug#18331) + -2014-09-02 Eli Zaretskii +2014-09-07 Paul Eggert + + Fix bug uncovered by changing alloca to auto buffer (Bug#18410). + * coding.c (growable_destination): New function. + (produce_chars): Use it for sanity checks. Do not fiddle with + dst_end if the source and destination are both nil, as it's + the caller's responsibility to avoid overlap. + * keyboard.c (read_decoded_event_from_main_queue): + The destination must be MAX_MULTIBYTE_LENGTH times the max source + length, not 4 times, to prevent decode_coding_c_string from trying + to reallocate a destination. This removes the need for the FIXME. + + * callproc.c (exec_failed) [DOS_NT]: Define a dummy. + All callers simplified. Add a comment about exec_failed, vfork, + and alloca. + + Adjust drag-and-drop fix when window is above top (Bug#18303). + * xselect.c (x_fill_property_data): Don't let sign bit of negative + XCDR bleed into XCAR's encoded value. Improve checks for + out-of-range data while we're at it. + +2014-09-07 Jan Djärv + + * xselect.c (x_fill_property_data): Handle negative XCDR when data + is CONSP (Bug#18303). + +2014-09-07 Eli Zaretskii + + * callproc.c (child_setup) [WINDOWSNT]: Don't call exec_failed if + 'alloca' gets passed arguments larger than MAX_ALLOCA. + + * font.c (MAX): Define if not defined elsewhere. + +2014-09-07 Paul Eggert + + * keyboard.c (read_decoded_event_from_main_queue): Reinstitute alloca + here for destination buffer, to work around what appears to be a + bug in decode_coding_c_string when the source and destination are + both C strings. + + Use SAFE_ALLOCA etc. to avoid unbounded stack allocation (Bug#18410). + This follows up on the recent thread in emacs-devel on alloca; see: + http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00042.html + This patch also cleans up alloca-related glitches noted while + examining the code looking for unbounded alloca. + * alloc.c (listn): + * callproc.c (init_callproc): + Rewrite to avoid need for alloca. + * buffer.c (mouse_face_overlay_overlaps) + (report_overlay_modification): + * buffer.h (GET_OVERLAYS_AT): + * coding.c (make_subsidiaries): + * doc.c (Fsnarf_documentation): + * editfns.c (Fuser_full_name): + * fileio.c (Ffile_name_directory, Fexpand_file_name) + (search_embedded_absfilename, Fsubstitute_in_file_name): + * fns.c (Fmake_hash_table): + * font.c (font_vconcat_entity_vectors, font_update_drivers): + * fontset.c (fontset_pattern_regexp, Ffontset_info): + * frame.c (Fmake_terminal_frame, x_set_frame_parameters) + (xrdb_get_resource, x_get_resource_string): + * ftfont.c (ftfont_get_charset, ftfont_check_otf, ftfont_drive_otf): + * ftxfont.c (ftxfont_draw): + * image.c (xbm_load, xpm_load, jpeg_load_body): + * keyboard.c (echo_add_key, menu_bar_items, tool_bar_items) + + * keymap.c (Fdescribe_buffer_bindings, describe_map): + * lread.c (openp): + * menu.c (digest_single_submenu, find_and_call_menu_selection) + (find_and_return_menu_selection): + * print.c (PRINTFINISH): + * process.c (Fformat_network_address): + * scroll.c (do_scrolling, do_direct_scrolling, scrolling_1): + * search.c (search_buffer, Fmatch_data, Fregexp_quote): + * sound.c (wav_play, au_play): + * syntax.c (skip_chars): + * term.c (tty_menu_activate, tty_menu_show): + * textprop.c (get_char_property_and_overlay): + * window.c (Fset_window_configuration): + * xdisp.c (safe__call, next_overlay_change, vmessage) + (compute_overhangs_and_x, draw_glyphs, note_mouse_highlight): + * xfaces.c (face_at_buffer_position): + * xmenu.c (x_menu_show): + Use SAFE_ALLOCA etc. instead of plain alloca, since the + allocation size isn't bounded. + * callint.c (Fcall_interactively): Redo memory_full check + so that it can be done at compile-time on some platforms. + * coding.c (MAX_LOOKUP_MAX): New constant. + (get_translation_table): Use it. + * callproc.c (call_process): Use SAFE_NALLOCA instead of + SAFE_ALLOCA, to catch integer overflows on size calculation. + (exec_failed) [!DOS_NT]: New function. + (child_setup) [!DOS_NT]: Use it. + * editfns.c (Ftranspose_regions): + Hoist USE_SAFE_ALLOC + SAFE_FREE out of 'if'. + * editfns.c (check_translation): + Allocate larger buffers on the heap. + * eval.c (internal_lisp_condition_case): + Check for MAX_ALLOCA overflow. + * fns.c (sort_vector): Use SAFE_ALLOCA_LISP rather than Fmake_vector. + (Fbase64_encode_region, Fbase64_decode_region): + Avoid unnecessary calls to SAFE_FREE before 'error'. + * buffer.c (mouse_face_overlay_overlaps): + * editfns.c (Fget_pos_property, check_translation): + * eval.c (Ffuncall): + * font.c (font_unparse_xlfd, font_find_for_lface): + * ftfont.c (ftfont_drive_otf): + * keyboard.c (echo_add_key, read_decoded_event_from_main_queue) + (menu_bar_items, tool_bar_items): + * sound.c (Fplay_sound_internal): + * xdisp.c (load_overlay_strings, dump_glyph_row): + Use an ordinary auto buffer rather than alloca, since the + allocation size is fixed and small. + * ftfont.c: Include . + (matching_prefix): New function. + (get_adstyle_property): Use it, to avoid need for alloca. + * keyboard.c (echo_add_key): + * keymap.c (describe_map): Use ptrdiff_t, not int. + * keyboard.c (echo_add_key): Prefer sizeof to strlen. + * keymap.c (Fdescribe_buffer_bindings): Use SBYTES, not SCHARS, + when counting bytes. + * lisp.h (xlispstrdupa): Remove, replacing with ... + (SAFE_ALLOCA_STRING): ... new macro with different API. + This fixes a portability problem, namely, alloca result + passed to another function. All uses changed. + (SAFE_ALLOCA, SAFE_ALLOCA_LISP): Check for MAX_ALLOCA, + not MAX_ALLOCA - 1. + * regex.c (REGEX_USE_SAFE_ALLOCA, REGEX_SAFE_FREE) + (REGEX_ALLOCATE): New macros. + (REGEX_REALLOCATE, REGEX_ALLOCATE_STACK, REGEX_REALLOCATE_STACK) + (REGEX_FREE_STACK, FREE_VARIABLES, re_match_2_internal): + Use them. + * xdisp.c (message3): Use SAFE_ALLOCA_STRING rather than doing it + by hand. + (decode_mode_spec_coding): Store directly into buf rather than + into an alloca temporary and copying the temporary to the buf. + +2014-09-06 Eli Zaretskii + + * Makefile.in (EMACS_HEAPSIZE): Remove, no longer used. (Bug#18416) + +2014-09-04 Jan D + + * xterm.c (x_term_init): Don't call x_session_initialize if running + as a daemon (Bug#18375). + + * xsmfns.c: Initialize ice_fd. + +2014-09-04 Paul Eggert + + Less chatter in 'make' output. + * Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0, am__v_GEN_1, AM_V_at) + (am__v_at_, am__v_at_0, am__v_at_1): New macros, taken from Automake. + ($(etc)/DOC, buildobj.h, gl-stamp): Use them. + +2014-09-03 Martin Rudalics + + * buffer.c (scroll-bar-height): Fix typo in doc-string. + * frame.c (Vdefault_frame_horizontal_scroll_bars): Remove + variable. + * nsfns.m (Fx_create_frame): + * w32fns.c (Fx_create_frame): + * xfns.c (Fx_create_frame): Default horizontal scroll bars to + nil. + +2014-09-03 Eli Zaretskii * dispnew.c (buffer_posn_from_coords): Fix an off-by-one error in the reported row in the case of a window with a header line, by