Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-111
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-112
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-113
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-114
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-115
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-518

1 files changed, 2 insertions, 1 deletions

diff --git a/src/indent.c b/src/indent.c
index 9b5a9e32c79..efc375e27f7 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -2109,7 +2109,8 @@ whether or not it is currently displayed in some window.  */)
       it.vpos = 0;
       /* Do this even if LINES is 0, so that we move back
          to the beginning of the current line as we ought.  */
-      move_it_by_lines (&it, XINT (lines), 0);
+      if (XINT (lines) >= 0 || IT_CHARPOS (it) > 0)
+        move_it_by_lines (&it, XINT (lines), 0);
 
       SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it));
     }