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

[Steven Tamm]

Index: emacs/src/macterm.c
diff -c emacs/src/macterm.c:1.90 emacs/src/macterm.c:1.91
*** emacs/src/macterm.c:1.90    Thu Jan  6 02:53:39 2005
--- emacs/src/macterm.c Fri Jan  7 07:11:24 2005
***************
*** 6715,6728 ****
            char_width = CharWidth (c);
            font->per_char[c - 0x20].width = char_width;
            font->per_char[c - 0x20].rbearing = char_width;
!           min_width = min (min_width, char_width);
!           max_width = max (max_width, char_width);
!           }
        font->min_bounds.width = min_width;
        font->max_bounds.width = max_width;
        }
      }
! 
    TextFont (old_fontnum);  /* restore previous font number, size and face */
    TextSize (old_fontsize);
    TextFace (old_fontface);
--- 6715,6733 ----
            char_width = CharWidth (c);
            font->per_char[c - 0x20].width = char_width;
            font->per_char[c - 0x20].rbearing = char_width;
!           /* Some Japanese fonts (in SJIS encoding) return 0 as the
!              character width of 0x7f.  */
!           if (char_width > 0)
!             {
!               min_width = min (min_width, char_width);
!               max_width = max (max_width, char_width);
!             }
!             }
        font->min_bounds.width = min_width;
        font->max_bounds.width = max_width;
        }
      }
!   
    TextFont (old_fontnum);  /* restore previous font number, size and face */
    TextSize (old_fontsize);
    TextFace (old_fontface);