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

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/08/11 18:50:49

Index: xdisp.c
===================================================================
RCS file: /sources/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1245
retrieving revision 1.1246
diff -u -b -r1.1245 -r1.1246
--- xdisp.c     8 Aug 2008 15:43:45 -0000       1.1245
+++ xdisp.c     11 Aug 2008 18:50:49 -0000      1.1246
@@ -21367,6 +21367,8 @@
        }
       else if (it->char_to_display == '\t')
        {
+         if (font->space_width > 0)
+           {
          int tab_width = it->tab_width * font->space_width;
          int x = it->current_x + it->continuation_lines_width;
          int next_tab_x = ((1 + x + tab_width - 1) / tab_width) * tab_width;
@@ -21390,6 +21392,12 @@
        }
       else
        {
+             it->pixel_width = 0;
+             it->nglyphs = 1;
+           }
+       }
+      else
+       {
          /* A multi-byte character.  Assume that the display width of the
             character is the width of the character multiplied by the
             width of the font.  */