aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2011-09-12 07:51:27 -0400
committerEli Zaretskii2011-09-12 07:51:27 -0400
commitfa819fed539dd8de122709d94fe28ed8f4901e4a (patch)
tree74356d6eb3172224fd7e66a82c239e1d830f61fa
parentb0415a0397edf20fa56d7812d14418cd1bc12273 (diff)
downloademacs-fa819fed539dd8de122709d94fe28ed8f4901e4a.tar.gz
emacs-fa819fed539dd8de122709d94fe28ed8f4901e4a.zip
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.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/indent.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 191462cb101..0cf5ee725d8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12011-09-12 Eli Zaretskii <eliz@gnu.org>
2
3 * indent.c (compute_motion): Process display vector front to back
4 rather than the other way around. (Bug#2496)
5
12011-09-12 Stefan Monnier <monnier@iro.umontreal.ca> 62011-09-12 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * fileio.c (Finsert_file_contents): Don't assume beg_offset is 0. 8 * 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_
1543 n = 1; 1543 n = 1;
1544 } 1544 }
1545 1545
1546 for (i = n - 1; i >= 0; --i) 1546 for (i = 0; i < n; ++i)
1547 { 1547 {
1548 if (VECTORP (charvec)) 1548 if (VECTORP (charvec))
1549 { 1549 {