diff options
| author | Paul Eggert <[email protected]> | 2011-03-18 22:07:42 -0700 |
|---|---|---|
| committer | Paul Eggert <[email protected]> | 2011-03-18 22:07:42 -0700 |
| commit | 001a7ab41b79b45c0c6a1b5b90fe4ed9bbfe4e14 (patch) | |
| tree | fc07acb7a1758b700f7a729723ee9bf161f8cce3 /src/xftfont.c | |
| parent | 0248044d313959dd87d64438fa297ca25adfc9ac (diff) | |
* xftfont.c (xftfont_open): Rename locals to avoid shadowing.
Diffstat (limited to 'src/xftfont.c')
| -rw-r--r-- | src/xftfont.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/xftfont.c b/src/xftfont.c index 7c8b5dde07..c27a4fcf91 100644 --- a/src/xftfont.c +++ b/src/xftfont.c @@ -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 |