From: Eli Zaretskii Date: Fri, 1 Aug 2014 13:10:07 +0000 (+0300) Subject: Merge from emacs-24; up to 2014-06-26T21:51:25Z!rgm@gnu.org. X-Git-Tag: emacs-25.0.90~2635^2~679^2~548 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8afcf7e9d72d4d4173a00151dd8f2ba1866000c1;p=emacs.git Merge from emacs-24; up to 2014-06-26T21:51:25Z!rgm@gnu.org. --- 8afcf7e9d72d4d4173a00151dd8f2ba1866000c1 diff --cc lisp/ChangeLog index e7496454fcc,3e5042a0f91..47f41a68cd0 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,40 -1,14 +1,45 @@@ + 2014-07-29 Eli Zaretskii + + * tutorial.el (tutorial--display-changes): Accept punctuation + characters before the key binding. (Bug#18146) + -2014-07-28 Stephen Berman +2014-07-31 Fabián Ezequiel Gallina - * doc-view.el (doc-view-open-text): Don't require that the - document is saved in a file (e.g., email attachment). + * progmodes/python.el: Shell output capture enhancements. + (python-shell-accept-process-output): New function. + (inferior-python-mode) + (python-shell-send-setup-code): Use it. -2014-07-27 Eli Zaretskii +2014-07-30 Christophe Deleuze (tiny change) + + * calendar/icalendar.el (icalendar--decode-isodatetime): Use + actual current-time-zone when converting to local time. (Bug#15408) + +2014-07-29 Martin Rudalics + + * window.el (window--state-put-2): Handle horizontal scroll + bars, if present. + +2014-07-29 Rüdiger Sonderfeld + + * menu-bar.el (menu-bar-update-buffers): Update item list format + in `buffers-menu' to confirm with changes to `get_keyelt' + (r117463). (Bug#18016) + +2014-07-28 Fabián Ezequiel Gallina + + * progmodes/python.el (inferior-python-mode): Make input prompts + read-only. + +2014-07-28 Emilio C. Lopes + + * net/tramp-sh.el (tramp-get-remote-python): Also search for + executables named "python2" or "python3". + (tramp-get-remote-uid-with-python): Use parentheses around + arguments to `print' to make it compatible with Python 3. + (tramp-get-remote-gid-with-python): Ditto. (Bug#18118) + +2014-07-28 Eli Zaretskii * window.el (window--pixel-to-total): Use FRAME's root window, not that of the selected frame. (Bug#18112, Bug#16674) diff --cc src/ChangeLog index a0ac451f35b,13415734c79..c28f8a607aa --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,58 -1,34 +1,90 @@@ + 2014-08-01 Eli Zaretskii + + Fix display of R2L lines when the last character fits only partially. + See http://lists.gnu.org/archive/html/emacs-devel/2014-07/msg00476.html + for the details. + * xdisp.c (extend_face_to_end_of_line): If the last glyph of an + R2L row is visible only partially, give the row a negative x + offset. + (display_line): Fix the calculation of the glyph whose pixel width + is used to decide whether the last produced glyph fits on the + line. When the last glyph fits only partially, give the row a + negative x offset. + -2014-07-29 Eli Zaretskii - + Fix hscroll of R2L lines that begin with a TAB or another wide glyph. + * xdisp.c (append_stretch_glyph): In a R2L glyph row, decrease the + pixel width of the first glyph that is hscrolled from display. + (display_line): In R2L glyph rows, don't give a negative offset to + row->x when the first glyph begins before first_visible_x. + -2014-07-29 Andreas Schwab ++ * xdisp.c (display_line): If called with iterator set up to write ++ to a marginal area, delay the call to handle_line_prefix until we ++ switch back to the text area. (Bug#18035) ++ ++ * .gdbinit (xwindow): The members total_cols, total_lines, ++ left_col, and top_line are C integers (and has been so for the ++ last 1.5 years). ++ ++2014-08-01 Andreas Schwab + + * macros.c (Fstart_kbd_macro): Initialize kbd_macro_ptr and + kbd_macro_end together with kbd_macro_buffer. (Bug#18140) + -2014-07-28 Eli Zaretskii +2014-08-01 Dmitry Antipov - * xdisp.c (display_line): If called with iterator set up to write - to a marginal area, delay the call to handle_line_prefix until we - switch back to the text area. (Bug#18035) + * atimer.c (toplevel) [HAVE_TIMERFD]: Include errno.h. + (timerfd_callback): Ignore weird events with no data. Add tight + assertions and comments. + (init_atimer) [HAVE_TIMERFD]: Add environment variable to optionally + disable timerfd-based timer. Use TFD_NONBLOCK for timer descriptor. + +2014-08-01 Paul Eggert + + * frame.c (x_set_frame_parameters): Fix typo in previous patch. + I had confused && with ||. + +2014-07-31 Paul Eggert + + Simplify timerfd configuration and fix some minor glitches. + * atimer.c (TIMERFD_CREATE_FLAGS): Remove; we now assume TFD_CLOEXEC. + (alarm_timer, alarm_timer_ok, set_alarm, init_atimer): + Fall back on timer_create if timerfd_create fails at runtime. + (resolution) [HAVE_CLOCK_GETRES]: Remove; we now rely on the + kernel primitives to do resolution. All uses removed. + (timerfd) [!HAVE_TIMERFD]: Define to be -1, for convenience. + (turn_on_atimers): Clear timer_create-based timers too, + for consistency. + + * frame.c (x_set_frame_parameters): Don't use uninitialized locals. + Without this change, the code can access the local variable 'width' + even when it has not been initialized, and likewise for 'height'; + in either case this leads to undefined behavior. + +2014-07-30 Dmitry Antipov + + * xrdb.c (x_load_resources) [USE_MOTIF]: Although not strictly + necessary, put horizontal scroll bar resources as well. See + . + * xterm.c (x_sync_with_move): Really wait 0.5s, not 0.0005s. + +2014-07-29 Dmitry Antipov + + * xrdb.c (x_load_resources) [!USE_MOTIF]: Put horizontal scroll bar + background value to match the resource of its vertical counterpart. + +2014-07-29 Martin Rudalics + + * frame.c (adjust_frame_size): Use FRAME_WINDOW_P instead of + FRAME_X_WINDOW when calling x_set_window_size (Bug#18138). + +2014-07-28 Martin Rudalics + + * frame.c (x_set_frame_parameters): Revert part of 2014-07-24 + change that added the top margin height to the requested height + and revert (undocumented) part of 2014-07-28 change that changed + the logic of whether a size change occurred. + +2014-07-28 Eli Zaretskii * .gdbinit (xwindow): The members total_cols, total_lines, left_col, and top_line are C integers (and has been so for the