(Fmove_to_column): Go after invis chars at the goal column.

1 files changed, 7 insertions, 1 deletions

diff --git a/src/indent.c b/src/indent.c
index 60641ae54dc..d77219484b7 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -693,7 +693,7 @@ The return value is the current column.")
       col = 0;
     }
 
-  while (col < goal && pos < end)
+  while (pos < end)
     {
       while (pos == next_boundary)
 	{
@@ -702,6 +702,12 @@ The return value is the current column.")
 	    goto endloop;
 	}
 
+      /* Test reaching the goal column.  We do this after skipping
+	 invisible characters, so that we put point before the
+	 character on which the cursor will appear.  */
+      if (col >= goal)
+	break;
+
       c = FETCH_CHAR (pos);
       if (dp != 0 && VECTORP (DISP_CHAR_VECTOR (dp, c)))
 	{