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)

diff --cc lisp/ChangeLog
index 570e3e248cc3f245cf42978a3ba4ad0dbe367a6a,8481dd1fccecd57833d9a5bde73c4deeec2d44f8..1f356a00217fb05465ed48297e391f7fd96e3ad3
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,8 -1,14 +1,14 @@@
 -2015-01-08  Eli Zaretskii  <eliz@gnu.org>
+ 2015-01-09  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * 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-04  Dmitry Gutov  <dgutov@yandex.ru>
  
 -      * 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  <rgm@gnu.org>
  

diff --cc src/ChangeLog
index 45946eb4a698755f4a8568f37292e5f64dc81289,6296302dc5e62a3c31bc54b2b7b5db03e1b58ac1..422933d22f9d60ea08435403107972d87fbb0c84
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,3 -1,20 +1,13 @@@
 -2015-01-08  Eli Zaretskii  <eliz@gnu.org>
 -
 -      * 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-10  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * 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  <eliz@gnu.org>
+ 
+       * emacs.c (usage_message): Fix the description of the -nl switch.
+       (Bug#19542)
+ 
  2015-01-05  Eli Zaretskii  <eliz@gnu.org>
  
        * xdisp.c (move_it_to, try_cursor_movement): Don't use the window

diff --cc src/emacs.c
Simple merge

diff --cc src/indent.c
Simple merge