[Emacs-diffs] Changes to emacs/src/xdisp.c

[Kenichi Handa]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.949 emacs/src/xdisp.c:1.950
*** emacs/src/xdisp.c:1.949     Tue Dec 28 17:52:51 2004
--- emacs/src/xdisp.c   Thu Dec 30 12:25:28 2004
***************
*** 19163,19176 ****
        }
        else if (it->char_to_display == '\t')
        {
!         int tab_width = it->tab_width * FRAME_COLUMN_WIDTH (it->f);
          int x = it->current_x + it->continuation_lines_width;
          int next_tab_x = ((1 + x + tab_width - 1) / tab_width) * tab_width;
  
          /* If the distance from the current position to the next tab
!            stop is less than a canonical character width, use the
             tab stop after that.  */
!         if (next_tab_x - x < FRAME_COLUMN_WIDTH (it->f))
            next_tab_x += tab_width;
  
          it->pixel_width = next_tab_x - x;
--- 19163,19176 ----
        }
        else if (it->char_to_display == '\t')
        {
!         int tab_width = it->tab_width * FRAME_SPACE_WIDTH (it->f);
          int x = it->current_x + it->continuation_lines_width;
          int next_tab_x = ((1 + x + tab_width - 1) / tab_width) * tab_width;
  
          /* If the distance from the current position to the next tab
!            stop is less than a space character width, use the
             tab stop after that.  */
!         if (next_tab_x - x < FRAME_SPACE_WIDTH (it->f))
            next_tab_x += tab_width;
  
          it->pixel_width = next_tab_x - x;