Mercurial > emacs
diff src/font.c @ 96831:47bb47a5494d
restore ability under NS to change font size from font panel (lost during some recent font backend refactoring)
author | Adrian Robert <Adrian.B.Robert@gmail.com> |
---|---|
date | Sun, 20 Jul 2008 00:47:28 +0000 |
parents | d45acf0c8d23 |
children | 9592c50233ab |
line wrap: on
line diff
--- a/src/font.c Sun Jul 20 00:37:45 2008 +0000 +++ b/src/font.c Sun Jul 20 00:47:28 2008 +0000 @@ -55,6 +55,10 @@ #endif /* MAC_OS */ Lisp_Object Qfont_spec, Qfont_entity, Qfont_object; + +#ifdef HAVE_NS +extern Lisp_Object Qfontsize; +#endif Lisp_Object Qopentype; @@ -3316,6 +3320,13 @@ pt /= 10; size = POINT_TO_PIXEL (pt, f->resy); +#ifdef HAVE_NS + if (size == 0) + { + Lisp_Object ffsize = get_frame_param(f, Qfontsize); + size = NUMBERP (ffsize) ? POINT_TO_PIXEL (XINT (ffsize), f->resy) : 0; + } +#endif } return font_open_entity (f, entity, size); } @@ -3390,7 +3401,11 @@ attrs[LFACE_FAMILY_INDEX] = attrs[LFACE_FOUNDRY_INDEX] = Qnil; attrs[LFACE_SWIDTH_INDEX] = attrs[LFACE_WEIGHT_INDEX] = attrs[LFACE_SLANT_INDEX] = Qnormal; +#ifndef HAVE_NS attrs[LFACE_HEIGHT_INDEX] = make_number (120); +#else + attrs[LFACE_HEIGHT_INDEX] = make_number (0); +#endif attrs[LFACE_FONT_INDEX] = Qnil; return font_load_for_lface (f, attrs, spec);