[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/macterm.c
From: |
Jan Djärv |
Subject: |
[Emacs-diffs] Changes to emacs/src/macterm.c |
Date: |
Sun, 20 Mar 2005 17:28:57 -0500 |
Index: emacs/src/macterm.c
diff -c emacs/src/macterm.c:1.106 emacs/src/macterm.c:1.107
*** emacs/src/macterm.c:1.106 Wed Mar 16 08:08:06 2005
--- emacs/src/macterm.c Sun Mar 20 22:28:54 2005
***************
*** 1703,1709 ****
*/
static XCharStruct *
! mac_per_char_metric (font, char2b, font_type)
XFontStruct *font;
XChar2b *char2b;
int font_type;
--- 1703,1710 ----
*/
static XCharStruct *
! mac_per_char_metric (f, font, char2b, font_type)
! FRAME_PTR f;
XFontStruct *font;
XChar2b *char2b;
int font_type;
***************
*** 6907,6913 ****
XCharStruct *pcm;
char2b.byte1 = 0x00, char2b.byte2 = 0x20;
! pcm = mac_per_char_metric (font, &char2b, 0);
if (pcm)
fontp->space_width = pcm->width;
else
--- 6908,6914 ----
XCharStruct *pcm;
char2b.byte1 = 0x00, char2b.byte2 = 0x20;
! pcm = mac_per_char_metric (f, font, &char2b, 0);
if (pcm)
fontp->space_width = pcm->width;
else
***************
*** 6917,6923 ****
{
int width = pcm->width;
for (char2b.byte2 = 33; char2b.byte2 <= 126; char2b.byte2++)
! if ((pcm = mac_per_char_metric (font, &char2b, 0)) != NULL)
width += pcm->width;
fontp->average_width = width / 95;
}
--- 6918,6924 ----
{
int width = pcm->width;
for (char2b.byte2 = 33; char2b.byte2 <= 126; char2b.byte2++)
! if ((pcm = mac_per_char_metric (f, font, &char2b, 0)) != NULL)
width += pcm->width;
fontp->average_width = width / 95;
}