bug 1376 partial fix and simplification.

[lyx.git] / src / text2.C

diff --git a/src/text2.C b/src/text2.C
index 2675333c6d95da86568412629036ffe15d908d42..97fc51aa5b048f91b88c6b82dfdd8765816c54b7 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -675,21 +675,12 @@ void LyXText::cursorEnd()
                return;
 
        RowList::iterator rit = cursorRow();
-       RowList::iterator next_rit = boost::next(rit);
-       RowList::iterator end = boost::next(rit);
        ParagraphList::iterator pit = cursor.par();
-       pos_type last_pos = lastPos(*pit, rit);
-
-       if (next_rit == end) {
-               ++last_pos;
-       } else {
-               if (pit->empty() ||
-                   (pit->getChar(last_pos) != ' ' && !pit->isNewline(last_pos))) {
-                       ++last_pos;
-               }
-       }
-
-       setCursor(pit, last_pos);
+       pos_type pos = lastPos(*pit, rit);
+       /* cursor should be before a hard newline only */
+       if (!pit->isNewline(pos))
+               ++pos;
+       setCursor(pit, pos);
 }