Mercurial > emacs

changeset 90725:6d8c81691fc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Finternal_char_font): Fix previous change.
author Kenichi Handa <handa@m17n.org>
date Tue, 12 Dec 2006 11:31:07 +0000
parents 96bde39d99b2
children 40b259875eae
files src/fontset.c
diffstat 1 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/fontset.c	Fri Dec 08 12:01:09 2006 +0000
+++ b/src/fontset.c	Tue Dec 12 11:31:07 2006 +0000
@@ -2031,7 +2031,7 @@
   struct frame *f;
   struct face *face;
   Lisp_Object charset, rfont_def;
-  int charset_id;
+  int cs_id;
 
   if (NILP (position))
     {
@@ -2040,7 +2040,7 @@
       f = XFRAME (selected_frame);
       face_id = DEFAULT_FACE_ID;
       pos = -1;
-      charset_id = -1;
+      cs_id = -1;
     }
   else
     {
@@ -2067,16 +2067,15 @@
       face_id = face_at_buffer_position (w, pos, -1, -1, &dummy, pos + 100, 0);
       charset = Fget_char_property (position, Qcharset, Qnil);
       if (CHARSETP (charset))
-	charset_id = XINT (CHARSET_SYMBOL_ID (charset));
+	cs_id = XINT (CHARSET_SYMBOL_ID (charset));
       else
-	charset_id = -1;
+	cs_id = -1;
     }
   if (! CHAR_VALID_P (c, 0))
     return Qnil;
   face_id = FACE_FOR_CHAR (f, FACE_FROM_ID (f, face_id), c, pos, Qnil);
   face = FACE_FROM_ID (f, face_id);
-  rfont_def = fontset_font (FONTSET_FROM_ID (face->fontset), c, face,
-			    charset_id);
+  rfont_def = fontset_font (FONTSET_FROM_ID (face->fontset), c, face, cs_id);
 #ifdef USE_FONT_BACKEND
   if (enable_font_backend)
     {