[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108139: Fix a typo that caused crashes in redisplay.

[Eli Zaretskii]

------------------------------------------------------------
revno: 108139
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Wed 2012-09-12 20:18:33 +0300
message:
  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.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-09-12 17:12:10 +0000
+++ b/src/ChangeLog     2012-09-12 17:18:33 +0000
@@ -5,6 +5,8 @@
        that fails, clear the desired glyph matrix before returning a
        failure indication to the caller.  Fixes leaving garbled display
        when fast scrolling with a down-key.  (Bug#12403)
+       (compute_stop_pos_backwards): Fix a typo that caused crashes while
+       scrolling through multibyte text.
 
 2012-09-12  Jan Djärv  <address@hidden>
 

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2012-09-12 17:12:10 +0000
+++ b/src/xdisp.c       2012-09-12 17:18:33 +0000
@@ -7669,7 +7669,7 @@
     {
       it->end_charpos = min (charpos + 1, ZV);
       charpos = max (charpos - SCAN_BACK_LIMIT, BEGV);
-      SET_TEXT_POS (pos, charpos, BYTE_TO_CHAR (charpos));
+      SET_TEXT_POS (pos, charpos, CHAR_TO_BYTE (charpos));
       reseat_1 (it, pos, 0);
       compute_stop_pos (it);
       /* We must advance forward, right?  */