Merge from origin/emacs-24

c0ba590 Fix vertical-motion and posn-at-point when word-wrap is
a323b93 Better multi-line input support in comint.el
008a04a todo-mode.el: Restore point on setting item done  (Bug#19727)
9615c0d doc/misc/erc.texi: fix typo
c648717 Update ERC docs and update MAINTANERS to include myself
d825f66 Fix filling circle/ellipse in Artist Mode  (Bug#19763)

Conflicts:
	admin/ChangeLog
	doc/misc/ChangeLog
	doc/misc/erc.texi
	lisp/ChangeLog
	src/ChangeLog

2 files changed, 38 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 0a05b544d98..5bfb1809139 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,13 @@
 2015-03-03  Eli Zaretskii  <eliz@gnu.org>
 
+        * xdisp.c (move_it_in_display_line_to): Handle the case where the
+        last character of a screen line is whitespace, and we are under
+        word-wrap with overflow-newline-into-fringe turned on.
+        (Bug#19769)
+
+2015-03-03  Eli Zaretskii  <eliz@gnu.org>
+2015-03-03  Eli Zaretskii  <eliz@gnu.org>
+
         * xdisp.c (handle_stop, handle_single_display_spec)
         (next-element_from_image): Don't reset the
         ignore_overlay_strings_at_pos_p flag here.
diff --git a/src/xdisp.c b/src/xdisp.c
index 5ef839eb865..ce685fd6e22 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -8604,7 +8604,16 @@ move_it_in_display_line_to (struct it *it,
                           if (BUFFER_POS_REACHED_P ())
                             {
                               if (it->line_wrap != WORD_WRAP
-                                  || wrap_it.sp < 0)
+                                  || wrap_it.sp < 0
+                                  /* If we've just found whitespace to
+                                     wrap, effectively ignore the
+                                     previous wrap point -- it is no
+                                     longer relevant, but we won't
+                                     have an opportunity to update it,
+                                     since we've reached the edge of
+                                     this screen line.  */
+                                  || (may_wrap
+                                      && IT_OVERFLOW_NEWLINE_INTO_FRINGE (it)))
                                 {
                                   it->hpos = hpos_before_this_char;
                                   it->current_x = x_before_this_char;
@@ -8668,7 +8677,26 @@ move_it_in_display_line_to (struct it *it,
                   else
                     IT_RESET_X_ASCENT_DESCENT (it);
 
-                  if (wrap_it.sp >= 0)
+                  /* If the screen line ends with whitespace, and we
+                     are under word-wrap, don't use wrap_it: it is no
+                     longer relevant, but we won't have an opportunity
+                     to update it, since we are done with this screen
+                     line.  */
+                  if (may_wrap && IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
+                    {
+                      /* If we've found TO_X, go back there, as we now
+                         know the last word fits on this screen line.  */
+                      if ((op & MOVE_TO_X) && new_x == it->last_visible_x
+                          && atx_it.sp >= 0)
+                        {
+                          RESTORE_IT (it, &atx_it, atx_data);
+                          atpos_it.sp = -1;
+                          atx_it.sp = -1;
+                          result = MOVE_X_REACHED;
+                          break;
+                        }
+                    }
+                  else if (wrap_it.sp >= 0)
                     {
                       RESTORE_IT (it, &wrap_it, wrap_data);
                       atpos_it.sp = -1;