mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-20 11:33:09 -08:00
Code Issues Projects Releases Wiki Activity

nsfont.m (nsfont_open): remove unused variable shrink. Remove commented-out code.

Browse source
This commit is contained in:
David Reitter 2009-04-27 21:21:31 +00:00
parent b892d3c9b2
commit 7fa87f63b4
1 changed files with 2 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/nsfont.m
View file

@ -630,7 +630,7 @@ nsfont_open (FRAME_PTR f, Lisp_Object font_entity, int pixel_size)
font->props[FONT_FILE_INDEX] = Qnil;
{
double expand, shrink, hshrink;
double expand, hshrink;
float full_height, min_height, hd;
const char *fontName = [[nsfont fontName] UTF8String];
int len = strlen (fontName);
@ -660,21 +660,9 @@ nsfont_open (FRAME_PTR f, Lisp_Object font_entity, int pixel_size)
hd = full_height - min_height;
/* standard height, similar to Carbon. Emacs.app: was 0.5 by default. */
expand = 0.0;
shrink = 1.0;
expand = 0.0;
hshrink = 1.0;
/*
if (expand < 0.0)
{
shrink = 1 + expand;
hshrink = 1 + expand / 2.0;
expand = 0.0;
}
else
shrink = hshrink = 1.0;
*/
font_info->underpos = 2; /*[sfont underlinePosition] is often clipped out */
font_info->underwidth = [sfont underlineThickness];
font_info->size = font->pixel_size;
@ -691,7 +679,6 @@ nsfont_open (FRAME_PTR f, Lisp_Object font_entity, int pixel_size)
font_info->max_bounds.lbearing = lrint (brect.origin.x);
font_info->max_bounds.rbearing =
lrint (brect.size.width - font_info->width);
/*font_info->width + (font_info->ital ? 0.2 * font_info->height : 0); */
#ifdef NS_IMPL_COCOA
/* set up synthItal and the CG font */