diff options
| author | David Reitter <david.reitter@gmail.com> | 2009-04-27 21:21:31 +0000 |
|---|---|---|
| committer | David Reitter <david.reitter@gmail.com> | 2009-04-27 21:21:31 +0000 |
| commit | 7fa87f63b4315e0bcf3a0b0ca28a5fca1a75cba9 (patch) | |
| tree | a615fa62ca01c6da26dc37aa85880a878b452774 | |
| parent | b892d3c9b2ac6306b7ccdfd5bc02a84f6e43ed6c (diff) | |
| download | emacs-7fa87f63b4315e0bcf3a0b0ca28a5fca1a75cba9.tar.gz | |
nsfont.m (nsfont_open): remove unused variable shrink. Remove commented-out code.
| -rw-r--r-- | src/nsfont.m | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/nsfont.m b/src/nsfont.m index b2e9c82bd67..a6ea4843067 100644 --- a/src/nsfont.m +++ b/src/nsfont.m @@ -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 */ |