From: Fabián Ezequiel Gallina Date: Wed, 28 Jan 2015 04:03:44 +0000 (-0300) Subject: Merge from origin/emacs-24 X-Git-Tag: emacs-25.0.90~2572^2~48 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b0edd7c69d88f245981a05e2333b09e3171d4e6f;p=emacs.git Merge from origin/emacs-24 b544ab5 Fix return value of vertical-motion at ZV (Bug#19553) 1f179ea Fix encoding of I/O in net-utils.el for MS-Windows. (Bug#19458) 70f298f Fix the description of -nl in --help text. (Bug#19542) --- b0edd7c69d88f245981a05e2333b09e3171d4e6f diff --cc lisp/ChangeLog index 570e3e248cc,8481dd1fcce..1f356a00217 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,8 -1,14 +1,14 @@@ + 2015-01-09 Eli Zaretskii + + * net/net-utils.el (net-utils-run-program, net-utils-run-simple): + On MS-Windows, bind coding-system-for-read to the console output + codepage. (Bug#19458) + -2015-01-08 Eli Zaretskii +2015-01-04 Dmitry Gutov - * simple.el (line-move-visual): When converting X pixel coordinate - to temporary-goal-column, adjust the value for right-to-left - screen lines. This fixes vertical-motion, next/prev-line, etc. + Unbreak `mouse-action' property in text buttons. + + * button.el (push-button): Fix regression from 2012-12-06. 2015-01-06 Glenn Morris diff --cc src/ChangeLog index 45946eb4a69,6296302dc5e..422933d22f9 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,3 -1,20 +1,13 @@@ + 2015-01-10 Eli Zaretskii + + * indent.c (Fvertical_motion): Return zero if we started from ZV + and there's an overlay after-string there. (Bug#19553) + + 2015-01-09 Eli Zaretskii + + * emacs.c (usage_message): Fix the description of the -nl switch. + (Bug#19542) + -2015-01-08 Eli Zaretskii - - * dispnew.c (buffer_posn_from_coords): Fix the value of the column - returned for right-to-left screen lines. (Before the change on - 2014-12-30, the incorrectly-computed X pixel coordinate concealed - this bug.) - 2015-01-05 Eli Zaretskii * xdisp.c (move_it_to, try_cursor_movement): Don't use the window