Commit 001a7ab4 authored by Paul Eggert's avatar Paul Eggert
Browse files

* xftfont.c (xftfont_open): Rename locals to avoid shadowing.

parent 0248044d
2011-03-19 Paul Eggert <eggert@cs.ucla.edu>
 
* xftfont.c (xftfont_shape): Now static, and defined only if needed.
(xftfont_open): Rename locals to avoid shadowing.
 
* ftfont.c (ftfont_resolve_generic_family): Fix pointer signedness.
(ftfont_otf_capability, ftfont_shape): Omit decls if not needed.
......@@ -280,7 +280,7 @@ xftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
{
FcResult result;
Display *display = FRAME_X_DISPLAY (f);
Lisp_Object val, filename, index, font_object;
Lisp_Object val, filename, idx, font_object;
FcPattern *pat = NULL, *match;
struct xftfont_info *xftfont_info = NULL;
struct font *font;
......@@ -298,7 +298,7 @@ xftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
return Qnil;
val = XCDR (val);
filename = XCAR (val);
index = XCDR (val);
idx = XCDR (val);
size = XINT (AREF (entity, FONT_SIZE_INDEX));
if (size == 0)
size = pixel_size;
......@@ -335,7 +335,7 @@ xftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
xftfont_add_rendering_parameters (pat, entity);
FcPatternAddString (pat, FC_FILE, (FcChar8 *) SDATA (filename));
FcPatternAddInteger (pat, FC_INDEX, XINT (index));
FcPatternAddInteger (pat, FC_INDEX, XINT (idx));
BLOCK_INPUT;
......@@ -409,9 +409,9 @@ xftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
spacing = FC_PROPORTIONAL;
if (! ascii_printable[0])
{
int i;
for (i = 0; i < 95; i++)
ascii_printable[i] = ' ' + i;
int ch;
for (ch = 0; ch < 95; ch++)
ascii_printable[ch] = ' ' + ch;
}
BLOCK_INPUT;
if (spacing != FC_PROPORTIONAL
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment