(face_before_or_after_it_pos): Pass multibyteness

to DEC_TEXT_POS and INC_TEXT_POS.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0c4bf7ea82ee4f6e8d06b34b1ddcd1681512cbc9..3dd4ce2b7c21e3a5e3d9d54d0f9e457f3bccaf8e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,14 @@
 2000-03-27  Gerd Moellmann  <gerd@gnu.org>
 
+       * xdisp.c (face_before_or_after_it_pos): Pass multibyteness
+       to DEC_TEXT_POS and INC_TEXT_POS.
+
+       * dispnew.c (direct_output_for_insert): Use DEC_TEXT_POS
+       with parameter MULTIBYTE_P.
+
+       * dispextern.h (INC_TEXT_POS, DEC_TEXT_POS): Add parameter 
+       MULTIBYTE_P.
+
        * editfns.c (Fsubst_char_in_region): Don't use INC_POS in unibyte
        buffers because it looks for multibyte character sequences which
        don't exist in unibyte text.

diff --git a/src/xdisp.c b/src/xdisp.c
index 12c95051436f3c1f6c4cfd580cf6b63a960b7001..16ab84c9cb7e03ab8279d40a457f72e5013018fd 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1969,7 +1969,7 @@ face_before_or_after_it_pos (it, before_p)
       pos = it->current.pos;
       
       if (before_p)
-       DEC_TEXT_POS (pos);
+       DEC_TEXT_POS (pos, it->multibyte_p);
       else
        {
          if (it->what == IT_COMPOSITION)
@@ -1977,7 +1977,7 @@ face_before_or_after_it_pos (it, before_p)
               composition.  */
            pos.charpos += it->cmp_len, pos.bytepos += it->len;
          else
-           INC_TEXT_POS (pos);
+           INC_TEXT_POS (pos, it->multibyte_p);
        }
       /* Determine face for CHARSET_ASCII, or unibyte.  */
       face_id = face_at_buffer_position (it->w,