From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 12 Sep 2011 11:51:27 +0000 (-0400)
Subject: Fix bug #2496 with column counting in presence of display tables.
X-Git-Tag: emacs-pretest-24.0.90~104^2~73
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fa819fed539dd8de122709d94fe28ed8f4901e4a;p=emacs.git

Fix bug #2496 with column counting in presence of display tables.

 src/indent.c (compute_motion): Process display vector front to back
 rather than the other way around.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 191462cb101..0cf5ee725d8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-12  Eli Zaretskii  <eliz@gnu.org>
+
+	* indent.c (compute_motion): Process display vector front to back
+	rather than the other way around.  (Bug#2496)
+
 2011-09-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* fileio.c (Finsert_file_contents): Don't assume beg_offset is 0.
diff --git a/src/indent.c b/src/indent.c
index 6e602d28f60..bae9ab1b46d 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -1543,7 +1543,7 @@ compute_motion (EMACS_INT from, EMACS_INT fromvpos, EMACS_INT fromhpos, int did_
 	      n = 1;
 	    }
 
-	  for (i = n - 1; i >= 0; --i)
+	  for (i = 0; i < n; ++i)
 	    {
 	      if (VECTORP (charvec))
 		{