aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2012-09-12 20:18:33 +0300
committerEli Zaretskii2012-09-12 20:18:33 +0300
commitf2016beaf388cab00ab1cef9c52f7790115a2da3 (patch)
tree36e653290609bc403f6ae64bb147937a3cf548fd /src
parentaa36e4d28b7a405fa542d9fa1dbbfd9758980f22 (diff)
downloademacs-f2016beaf388cab00ab1cef9c52f7790115a2da3.tar.gz
emacs-f2016beaf388cab00ab1cef9c52f7790115a2da3.zip
Fix a typo that caused crashes in redisplay.
src/xdisp.c (compute_stop_pos_backwards): Fix a typo that caused crashes while scrolling through multibyte text.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/xdisp.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 39bdd191188..6b5b6e1455d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -5,6 +5,8 @@
5 that fails, clear the desired glyph matrix before returning a 5 that fails, clear the desired glyph matrix before returning a
6 failure indication to the caller. Fixes leaving garbled display 6 failure indication to the caller. Fixes leaving garbled display
7 when fast scrolling with a down-key. (Bug#12403) 7 when fast scrolling with a down-key. (Bug#12403)
8 (compute_stop_pos_backwards): Fix a typo that caused crashes while
9 scrolling through multibyte text.
8 10
92012-09-12 Jan Djärv <jan.h.d@swipnet.se> 112012-09-12 Jan Djärv <jan.h.d@swipnet.se>
10 12
diff --git a/src/xdisp.c b/src/xdisp.c
index 3fab4b54cf0..c5962541cb6 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7669,7 +7669,7 @@ compute_stop_pos_backwards (struct it *it)
7669 { 7669 {
7670 it->end_charpos = min (charpos + 1, ZV); 7670 it->end_charpos = min (charpos + 1, ZV);
7671 charpos = max (charpos - SCAN_BACK_LIMIT, BEGV); 7671 charpos = max (charpos - SCAN_BACK_LIMIT, BEGV);
7672 SET_TEXT_POS (pos, charpos, BYTE_TO_CHAR (charpos)); 7672 SET_TEXT_POS (pos, charpos, CHAR_TO_BYTE (charpos));
7673 reseat_1 (it, pos, 0); 7673 reseat_1 (it, pos, 0);
7674 compute_stop_pos (it); 7674 compute_stop_pos (it);
7675 /* We must advance forward, right? */ 7675 /* We must advance forward, right? */