From: Fabián Ezequiel Gallina Date: Sat, 27 Dec 2014 16:21:17 +0000 (-0300) Subject: Merge from origin/emacs-24 X-Git-Tag: emacs-25.0.90~2631^2~15^2~17 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=411c1c65313aa4e22730ba9762e073881f4e299a;p=emacs.git Merge from origin/emacs-24 216c6aa * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use `tramp-rsh-end-of-line', it ought to be more robust. 20cfd24 Improve indexing on the chapter/section/subsection levels. 14c3739 * lisp/progmodes/js.el (js-syntax-propertize): "return" can't be divided. ea78112 * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use "\n" as end-of-line delimeter for passwords, when running on MS Windows. 012479a * lisp/progmodes/sh-script.el: Don't set global indent-line-function 75e114f Fix line numbers on Python shell. d0fd23c doc/emacs/buffers.texi (Kill Buffer): Improve indexing. 8e818d1 Keep maximized when going fullscreen. 749813e python.el: Fix electric colon behavior 936d5e5 Fix last patch. 74d3b20 Fixes: debbugs:18623 Conflicts: doc/emacs/ChangeLog doc/lispref/ChangeLog doc/lispref/functions.texi lisp/ChangeLog src/ChangeLog src/xterm.c test/ChangeLog --- 411c1c65313aa4e22730ba9762e073881f4e299a diff --cc doc/emacs/ChangeLog index 7081c19c3f0,2d4263ad786..b9ca8b39fd3 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@@ -1,28 -1,8 +1,33 @@@ -2014-12-22 Eli Zaretskii ++2014-12-27 Eli Zaretskii + + * buffers.texi (Kill Buffer): Improve indexing. + -2014-11-19 Paul Eggert ++2014-12-27 Paul Eggert +2014-12-24 Stephen Leake + + * trouble.texi: Move user-level information from CONTRIBUTE here. + +2014-12-14 Alan Mackenzie + + * display.texi (Scrolling): fast-but-imprecise-scrolling. + Describe new variable. + +2014-12-14 Cameron Desautels + + * custom.texi (Saving Customizations): Mention + `custom-prompt-customize-unsaved-options'. + +2014-12-08 Lars Magne Ingebrigtsen + + * misc.texi (Network Security): Mention the new protocol-level + `high' NSM checks. + +2014-12-08 Eric S. Raymond + + * maintaining.texi: Suopport fo Arch has been moved to obosolete, + remove references that imply otherwise. + +2014-11-29 Paul Eggert Lessen focus on ChangeLog files, as opposed to change log entries. * maintaining.texi (Change Log): Mention that ChangeLog files may diff --cc doc/lispref/ChangeLog index 2d964cf6505,5bf23bc895d..66f1d3a1785 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@@ -1,58 -1,111 +1,160 @@@ -2014-12-23 Eli Zaretskii ++2014-12-27 Eli Zaretskii + + * windows.texi (Recombining Windows): Index subject of sections. + + * variables.texi (Variables with Restricted Values) + (Generalized Variables): Index subject of sections. + + * text.texi (Buffer Contents, Examining Properties) + (Changing Properties, Property Search, Substitution): Index + subject of sections. + + * syntax.texi (Motion and Syntax, Parsing Expressions) + (Motion via Parsing, Position Parse, Control Parsing): Index + subject of sections. + + * strings.texi (Predicates for Strings, Creating Strings) + (Modifying Strings, Text Comparison): Index subject of sections. + + * searching.texi (Syntax of Regexps, Regexp Special) + (Regexp Functions, Regexp Functions): Index subject of sections. + + * processes.texi (Subprocess Creation, Process Information): Index + subject of sections. + + * positions.texi (Screen Lines): Index subject of sections. + + * nonascii.texi (Scanning Charsets, Specifying Coding Systems): + Index subject of sections. + + * minibuf.texi (Text from Minibuffer, Object from Minibuffer) + (Multiple Queries, Minibuffer Contents): Index subject of + sections. + + * markers.texi (Predicates on Markers, Creating Markers) + (Information from Markers, Moving Markers): Index subject of + sections. + + * macros.texi (Defining Macros, Problems with Macros): Index + subject of sections. + + * loading.texi (Loading Non-ASCII, Where Defined): Index subject + of sections. + + * lists.texi (List-related Predicates, List Variables, Setcar) + (Setcdr, Plist Access): Index subject of sections. + + * keymaps.texi (Controlling Active Maps, Scanning Keymaps) + (Modifying Menus): Index subject of sections. + + * help.texi (Accessing Documentation, Help Functions): Index + subject of sections. + + * hash.texi (Hash Access): Index subject of sections. + + * functions.texi (Core Advising Primitives) + (Advising Named Functions, Porting old advices): Index subject of + sections. + + * frames.texi (Creating Frames, Initial Parameters) + (Position Parameters, Buffer Parameters, Minibuffers and Frames) + (Pop-Up Menus, Drag and Drop): Index subject of sections. + + * files.texi (Visiting Functions, Kinds of Files) + (Unique File Names): Index subject of sections. + + * display.texi (Refresh Screen, Echo Area Customization) + (Warning Variables, Warning Options, Delayed Warnings) + (Temporary Displays, Managing Overlays, Overlay Properties) + (Finding Overlays, Size of Displayed Text, Defining Faces) + (Attribute Functions, Displaying Faces, Face Remapping) + (Basic Faces, Font Lookup, Fontsets, Replacing Specs) + (Defining Images, Showing Images): Index subject of sections. + + * debugging.texi (Debugging, Explicit Debug) + (Invoking the Debugger, Excess Open, Excess Close): Index subject + of sections. + + * customize.texi (Defining New Types, Applying Customizations) + (Custom Themes): Index subject of sections. + + * control.texi (Sequencing, Combining Conditions) + (Processing of Errors, Cleanups): Index subject of sections. + + * compile.texi (Eval During Compile): Index subject of sections. + + * commands.texi (Using Interactive, Distinguish Interactive) + (Command Loop Info, Classifying Events, Event Mod) + (Invoking the Input Method): Index subject of sections. + + * buffers.texi (Buffer List, Buffer Gap): Index subject of sections. + + * backups.texi (Making Backups, Numbered Backups, Backup Names) + (Reverting): Index subject of sections. + + * abbrevs.texi (Abbrev Tables, Defining Abbrevs, Abbrev Files) + (Abbrev Expansion, Standard Abbrev Tables, Abbrev Properties) + (Abbrev Table Properties): Index subject of sections. + + * os.texi (Time of Day, Time Conversion, Time Parsing) + (Time Calculations, Idle Timers): Index subject of sections. + -2014-12-18 Stefan Monnier ++2014-12-27 Stefan Monnier +2014-12-25 Martin Rudalics - * display.texi (Forcing Redisplay): Remove references to - redisplay-dont-pause and redisplay-preemption-period (which doesn't - even exist). + * windows.texi (Windows): Resync @menu order with @node order. -2014-12-11 Eli Zaretskii + * minibuf.texi (Minibuffer Windows): Add descriptions of + `resize-mini-windows' and `max-mini-window-height'. + +2014-12-25 Glenn Morris + + * windows.texi (Windows): Sync @menu order with @node order. + + * sequences.texi (Sequence Functions): Copyedits. + + * control.texi (Pattern matching case statement): + * positions.texi (List Motion): + * streams.texi (Output Functions): + * strings.texi (Text Comparison): + * text.texi (Document Object Model): Markup fixes. + +2014-12-22 Paul Eggert + + Remove obsolete references to pre-C99 builds + * internals.texi (C Integer Types): Don't mention pre-C99 compilers. + +2014-12-19 Martin Rudalics + + * windows.texi (Resizing Windows): Describe new argument of + `fit-window-to-buffer'. Move description of `window-size-fixed' + to new section below. + (Preserving Window Sizes): New section describing + `window-size-fixed' and `window-preserve-size'. + (Display Action Functions): Describe `preserve-size' alist + entry. + (Window Parameters): Describe `preserved-size' parameter. + +2014-12-18 Eli Zaretskii + + * display.texi (Low-Level Font): Document font-info and query-font. + +2014-12-16 Nicolas Petton + + * sequences.texi (Seq Library): Add documentation for seq.el. + +2014-12-15 Alan Mackenzie + + "Advice" is a mass noun. Amend text accordingly. + * functions.texi: (Advising Functions, Core Advising Primitives) + (Advising Named Functions, Advice combinators) + (Porting old advice): Replace, e.g., "an advice" with "advice". + +2014-12-13 Lars Magne Ingebrigtsen + + * files.texi (Relative File Names): Mention `directory-name-p'. + +2014-12-13 Eli Zaretskii * text.texi (Comparing Text): Prevent a text string from being broken between 2 lines. (Bug#19257) diff --cc doc/lispref/functions.texi index 0ac084b668e,d9477d2c0b1..9555c218da5 --- a/doc/lispref/functions.texi +++ b/doc/lispref/functions.texi @@@ -1506,8 -1498,9 +1508,9 @@@ More specifically, the composition of t @end table -@node Porting old advices +@node Porting old advice @subsection Adapting code using the old defadvice + @cindex old advices, porting A lot of code uses the old @code{defadvice} mechanism, which is largely made obsolete by the new @code{advice-add}, whose implementation and semantics is diff --cc doc/lispref/minibuf.texi index 57ae0e999b4,cf36953098f..e6d6ad001e5 --- a/doc/lispref/minibuf.texi +++ b/doc/lispref/minibuf.texi @@@ -2260,31 -2239,10 +2263,33 @@@ This function returns non-@code{nil} i active minibuffer window. @end defun +The following two options control whether minibuffer windows are resized +automatically and how large they can get in the process. + +@defopt resize-mini-windows +This option specifies whether minibuffer windows are resized +automatically. The default value is @code{grow-only}, which means that +a minibuffer window by default expands automatically to accommodate the +text it displays and shrinks back to one line as soon as the minibuffer +gets empty. If the value is @code{t}, Emacs will always try to fit the +height of a minibuffer window to the text it displays (with a minimum of +one line). If the value is @code{nil}, a minibuffer window never +changes size automatically. In that case the window resizing commands +(@pxref{Resizing Windows}) can be used to adjust its height. +@end defopt + +@defopt max-mini-window-height +This option provides a maximum height for resizing minibuffer windows +automatically. A floating-point number specifies a fraction of the +frame's height; an integer specifies the maximum number of lines. The +default value is 0.25. +@end defopt + + @node Minibuffer Contents @section Minibuffer Contents + @cindex access minibuffer contents + @cindex minibuffer contents, accessing These functions access the minibuffer prompt and contents. diff --cc doc/lispref/os.texi index b7094479db2,88aed7a8bf3..e3e5613025d --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi @@@ -1320,16 -1306,17 +1321,17 @@@ time zone @node Time Conversion @section Time Conversion @cindex calendrical information + @cindex time conversion - These functions convert time values (lists of two to four integers, -as explained in the previous section) into calendrical information and -vice versa. + These functions convert time values (@pxref{Time of Day}) into +calendrical information and vice versa. - Many 32-bit operating systems are limited to time values containing -32 bits of information; these systems typically handle only the times -from 1901-12-13 20:45:52 UTC through 2038-01-19 03:14:07 UTC@. -However, 64-bit and some 32-bit operating systems have larger time -values, and can represent times far in the past or future. + Many 32-bit operating systems are limited to system times containing +32 bits of information in their seconds component; these systems +typically handle only the times from 1901-12-13 20:45:52 UTC through +2038-01-19 03:14:07 UTC@. However, 64-bit and some 32-bit operating +systems have larger seconds components, and can represent times far in +the past or future. Time conversion functions always use the Gregorian calendar, even for dates before the Gregorian calendar was introduced. Year numbers @@@ -1643,9 -1636,12 +1648,12 @@@ interactively, it prints the duration i @node Time Calculations @section Time Calculations + @cindex time calculations + @cindex comparing time values + @cindex calendrical computations These functions perform calendrical computations using time values -(the kind of list that @code{current-time} returns). +(@pxref{Time of Day}). @defun time-less-p t1 t2 This returns @code{t} if time value @var{t1} is less than time value diff --cc lisp/ChangeLog index 81740630e2a,22728121a15..61e2e425ccd --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,4 -1,48 +1,49 @@@ -2014-12-24 Michael Albinus ++2014-12-27 Michael Albinus + + * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): + Use `tramp-rsh-end-of-line', it ought to be more robust. + -2014-12-23 Stefan Monnier ++2014-12-27 Stefan Monnier + + * progmodes/js.el (js-syntax-propertize): "return" can't be divided + (bug#19397). + -2014-12-23 Michael Albinus ++2014-12-27 Michael Albinus + + * net/tramp.el (tramp-read-passwd): Ignore errors from `auth-source-*'. + + * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use "\n" + as end-of-line delimeter for passwords, when running on MS Windows. + -2014-12-23 Stefan Monnier ++2014-12-27 Stefan Monnier + + * progmodes/sh-script.el (sh-set-shell): Don't change the global value + of indent-line-function (bug#19433). + -2014-12-23 Fabián Ezequiel Gallina ++2014-12-27 Fabián Ezequiel Gallina + + Fix line numbers on Python shell. + * progmodes/python.el (python-shell--save-temp-file): Do not + append coding cookie. + (python-shell-send-string): Generalize for + python-shell-send-region. + (python--use-fake-loc): Delete var. + (python-shell-buffer-substring): Cleanup fake-loc logic. + (python-shell-send-region): Remove fake-loc logic, simplify. + -2014-12-22 Fabián Ezequiel Gallina ++2014-12-27 Fabián Ezequiel Gallina + + * progmodes/python.el (python-indent-post-self-insert-function): + Make colon to re-indent only for dedenters, handling + multiline-statements gracefully. + -2014-12-21 Michael Albinus ++2014-12-27 Michael Albinus + + * net/tramp.el (tramp-handle-insert-file-contents): + Set `find-file-not-found-functions' in case of errors. (Bug#18623) + -2014-12-19 Michael Albinus ++2014-12-27 Michael Albinus +2014-12-27 Michael Albinus * net/tramp-sh.el (tramp-send-command-and-read): New optional arg MARKER. diff --cc src/ChangeLog index 8e72ddbf9c4,9aeb8f26152..9bc28de6813 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,170 -1,7 +1,174 @@@ -2014-12-22 Jan Djärv ++2014-12-27 Jan Djärv + + * xterm.c (do_ewmh_fullscreen): Don't remove maximized_horz/vert + when going to fullscreen (Bug#0x180004f). +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 + + * xterm.c (x_bitmap_icon): Partly revert change from 2014-03-21 which + breaks icon setting for Gtk+ except for initial frame (Bug#19403). + +2014-12-22 Paul Eggert + + Use bool for boolean in xterm.c + * frame.h, nsterm.m, w32term.c, w32term.h, xterm.c: + (x_set_window_size, x_bitmap_icon): + * nsterm.m (ns_frame_raise_lower, x_new_font): + * termhooks.h (struct terminal.toggle_invisible_pointer_hook) + (struct terminal.frame_raise_lower_hook): + * w32term.c (w32_frame_raise_lower): + * xterm.c, xterm.h (x_text_icon): + * xterm.c (x_update_window_begin, x_update_window_end) + (x_update_end, x_after_update_window_line) + (x_set_glyph_string_gc, x_draw_glyph_string_background) + (x_draw_glyph_string_foreground) + (x_draw_composite_glyph_string_foreground) + (x_alloc_lighter_color, x_draw_relief_rect) + (x_draw_glyph_string_box, x_draw_image_relief) + (x_draw_image_glyph_string, x_draw_stretch_glyph_string) + (x_draw_underwave, x_draw_glyph_string, x_show_hourglass) + (x_hide_hourglass): + (XFillRectangle) [HAVE_GTK3]: + (XTtoggle_invisible_pointer, frame_highlight, frame_unhighlight) + (x_focus_changed, x_find_modifier_meanings, note_mouse_movement) + (XTmouse_position, xt_action_hook, xt_horizontal_action_hook) + (x_send_scroll_bar_event, xm_scroll_callback) + (xg_scroll_callback, xaw_jump_callback, xaw_scroll_callback) + (x_create_toolkit_scroll_bar) + (x_create_horizontal_toolkit_scroll_bar) + (x_set_toolkit_horizontal_scroll_bar_thumb, x_scroll_bar_create) + (x_scroll_bar_set_handle, XTset_vertical_scroll_bar) + (XTset_horizontal_scroll_bar, x_scroll_bar_expose) + (x_scroll_bar_handle_click, x_scroll_bar_note_movement) + (x_scroll_bar_report_motion) + (x_horizontal_scroll_bar_report_motion, x_net_wm_state) + (handle_one_xevent, XTread_socket, x_draw_bar_cursor) + (x_draw_window_cursor, x_clear_errors) + (x_trace_wire, x_new_font, x_set_offset, wm_supports) + (set_wm_state, x_set_sticky, get_current_wm_state) + (do_ewmh_fullscreen, x_handle_net_wm_state) + (x_check_expected_move, x_sync_with_move, x_wait_for_event) + (x_set_window_size_1, XTframe_raise_lower) + (x_make_frame_visible, x_iconify_frame) + (x_timeout_atimer_activated_flag, same_x_server, x_display_ok) + (x_term_init, x_process_timeouts, x_activate_timeout_atimer) + (x_delete_terminal, x_initialize, syms_of_xterm): + Use bool for boolean. + +2014-12-20 Paul Eggert + + * composite.h (struct composition.width): Now int + instead of unsigned short, as we prefer signed integers. + + Let charset tick grow past USHRT_MAX + * charset.c, charset.h (charset_ordered_list_tick): + Now EMACS_UINT, not unsigned short. + * fontset.c (reorder_font_vector): Allow the tick to grow to the + maximum representable Emacs integer value before wrapping it around. + + Simplify unexec file mode setting + * unexaix.c, unexcoff.c, unexelf.c, unexmacosx.c: + Don't include when no longer needed. + (unexec): Create file with correct mode in the first place, + rather than overwriting the mode later and fiddling with the + global umask in the mean time. Avoid bogus usage like + 'umask (777)', which should have been 'umask (0777)'. + (mark_x): Remove. All callers removed. + +2014-12-19 Paul Eggert + + Minor cleanups for Lisp objects and symbols + * alloc.c (next_vector, set_next_vector): + * lisp.h (lisp_h_INTEGERP, make_number, XFASTINT, make_natnum): + (lisp_h_make_number) [USE_LSB_TAG]: + Use Lisp_Int0 instead of the mystery constant 0. + * alloc.c (mark_object): Always set and use po; that's simpler. + (CHECK_LIVE, CHECK_ALLOCATED_AND_LIVE): + Properly parenthesize definientia. + * bidi.c (bidi_initialize): + * buffer.c (init_buffer_once): + * nsfns.m (syms_of_nsfns): + * nsmenu.m (syms_of_nsmenu): + * nsselect.m (syms_of_nsselect): + Prefer DEFSYM to defining by hand. + * buffer.c (syms_of_buffer): Omit unneeded staticpros. + * data.c: Fix too-long line. + * lisp.h (DECLARE_GDB_SYM): New macro. + (DEFINE_GDB_SYMBOL_BEGIN): Use it. + (DEFINE_GDB_SYMBOL_BEGIN, DEFINE_GDB_SYMBOL_END) [!MAIN_PROGRAM]: + Declare the symbol, so it's visible to everywhere lisp.h is included. + Move forward decls as far forward as they can go, + to allow future changes to use them. + +2014-12-18 Paul Eggert + + * gnutls.c: Include gnutls.h. + This to check syms_of_gnutls's API even when !HAVE_GNUTLS. + * image.c (svg_load): Fix pointer signedness. + +2014-12-18 Martin Rudalics + + * frame.c (frame_windows_min_size): New argument IGNORE. + (adjust_frame_size): When called from change_frame_size call + frame_windows_min_size with IGNORE Qt so we can ignore size + restrictions. 2014-12-18 Eli Zaretskii diff --cc src/xterm.c index 0640208ca14,ec1cad35fdd..130174dff19 --- a/src/xterm.c +++ b/src/xterm.c @@@ -9230,13 -8371,9 +9230,9 @@@ do_ewmh_fullscreen (struct frame *f switch (f->want_fullscreen) { case FULLSCREEN_BOTH: - if (cur == FULLSCREEN_WIDTH || cur == FULLSCREEN_MAXIMIZED - || cur == FULLSCREEN_HEIGHT) - set_wm_state (frame, false, - dpyinfo->Xatom_net_wm_state_maximized_horz, - dpyinfo->Xatom_net_wm_state_maximized_vert); - set_wm_state (frame, true, - dpyinfo->Xatom_net_wm_state_fullscreen, None); + if (cur != FULLSCREEN_BOTH) - set_wm_state (frame, 1, dpyinfo->Xatom_net_wm_state_fullscreen, ++ set_wm_state (frame, true, dpyinfo->Xatom_net_wm_state_fullscreen, + None); break; case FULLSCREEN_WIDTH: if (cur == FULLSCREEN_BOTH || cur == FULLSCREEN_HEIGHT diff --cc test/ChangeLog index 4e59ee0afbf,a91392d3fe7..e7b8fec0ec9 --- a/test/ChangeLog +++ b/test/ChangeLog @@@ -1,4 -1,9 +1,10 @@@ -2014-12-22 Fabián Ezequiel Gallina ++2014-12-27 Fabián Ezequiel Gallina + + * automated/python-tests.el (python-indent-electric-colon-2) + (python-indent-electric-colon-3): New tests. + -2014-12-14 João Távora ++2014-12-27 João Távora +2014-12-27 João Távora * automated/electric-tests.el (autowrapping-7): Tests for tex-mode.