# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 888888556 0
# Node ID 0e9e9906db7b4722b2a61426bfb7ff9bad14f2e2
# Parent  517de9005275eabeef7d02b85f554f2c93bbcfd5
(try_window_id): Use DEC_BOTH unconditionally.
(display_text_line): Likewise.

diff -r 517de9005275 -r 0e9e9906db7b src/xdisp.c
--- a/src/xdisp.c	Tue Mar 03 01:01:55 1998 +0000
+++ b/src/xdisp.c	Tue Mar 03 01:29:16 1998 +0000
@@ -2520,7 +2520,6 @@
   int selective = (INTEGERP (current_buffer->selective_display)
 		   ? XINT (current_buffer->selective_display)
 		   : !NILP (current_buffer->selective_display) ? -1 : 0);
-  int multibyte = !NILP (current_buffer->enable_multibyte_characters);
   struct position val, bp, ep, xp, pp;
   int scroll_amount = 0;
   int delta;
@@ -2599,11 +2598,7 @@
       val.hpos = bp.prevhpos - width + lmargin;
       val.tab_offset = bp.tab_offset + bp.prevhpos - width;
       did_motion = 1;
-      pos--;
-      if (multibyte)
-	DEC_POS (pos_byte);
-      else
-	pos_byte--;
+      DEC_BOTH (pos, pos_byte);
     }
 
   bp.vpos = vpos;
@@ -2866,11 +2861,7 @@
 	{
 	  val.hpos = xp.prevhpos - width + lmargin;
 	  val.tab_offset = xp.tab_offset + bp.prevhpos - width;
-	  pos--;
-	  if (multibyte)
-	    DEC_POS (pos_byte);
-	  else
-	    pos_byte--;
+	  DEC_BOTH (pos, pos_byte);
 	}
 
       blank_end_of_window = 1;
@@ -3277,12 +3268,9 @@
       if (left_edge->vpos > vpos
           || left_edge->hpos > 0)
         {
-          pos = left_edge->bufpos - 1;
+          pos = left_edge->bufpos;
 	  pos_byte = left_edge->bytepos;
-	  if (multibyte)
-	    DEC_POS (pos_byte);
-	  else
-	    pos_byte--;
+	  DEC_BOTH (pos, pos_byte);
           hpos = left_edge->prevhpos;
         }
       else
@@ -3926,11 +3914,7 @@
 	    {
 	      *p1++ = fix_glyph (f, continuer, 0);
 	      val.vpos = 0;
-	      lastpos--;
-	      if (multibyte)
-		DEC_POS (lastpos_byte);
-	      else
-		lastpos_byte--;
+	      DEC_BOTH (lastpos, lastpos_byte);
 	      val.tab_offset = taboffset + width;
 	    }
 	}