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)

3 files changed, 17 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 45946eb4a69..422933d22f9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+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 --git a/src/emacs.c b/src/emacs.c
index 37202a14a99..fdd17d1e062 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -231,7 +231,7 @@ Initialization options:\n\
     "\
 --no-desktop                do not load a saved desktop\n\
 --no-init-file, -q          load neither ~/.emacs nor default.el\n\
---no-shared-memory, -nl     do not use shared memory\n\
+--no-loadup, -nl            do not load loadup.el into bare Emacs\n\
 --no-site-file              do not load site-start.el\n\
 --no-site-lisp, -nsl        do not add site-lisp directories to load-path\n\
 --no-splash                 do not display a splash screen on startup\n\
diff --git a/src/indent.c b/src/indent.c
index 589aeb9c005..8660400e1ce 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -2137,10 +2137,15 @@ whether or not it is currently displayed in some window.  */)
               if (nlines > 1)
                 move_it_by_lines (&it, min (PTRDIFF_MAX, nlines - 1));
             }
-          else
+          else  /* it_start = ZV */
             {
               it.vpos = 0;
               move_it_by_lines (&it, min (PTRDIFF_MAX, nlines));
+              /* We could have some display or overlay string at ZV,
+                 in which case it.vpos will be nonzero now, while
+                 actually we didn't move vertically at all.  */
+              if (IT_CHARPOS (it) == CHARPOS (pt) && CHARPOS (pt) == it_start)
+                it.vpos = 0;
             }
         }