emacs: src/fontset.c comparison

comparison src/fontset.c @ 95230:fa14617b247e

Delete unused variables and add casting for char * throughout the file. (fontset_font): Try the fallback fonts of the current fontset before consulting the default fontset.

author	Kenichi Handa <handa@m17n.org>
date	Fri, 23 May 2008 02:21:30 +0000
parents	a6a4ada91449
children	993b2f1f702e

comparison

equal deleted inserted replaced

-:38cbd89dd626
+:fa14617b247e
 }
 /* Find the first available font in the vector of RFONT-DEF.  */
 for (; i < ASIZE (vec); i++)
 {
-Lisp_Object font_def, font_entity, font_object;
+Lisp_Object font_entity, font_object;
 elt = AREF (vec, i);
 if (NILP (elt))
 	/* This is the sign of not to try fallback fonts.  */
 	return Qt;
 rfont_def = fontset_find_font (fontset, c, face, id, 0);
 if (VECTORP (rfont_def))
 return rfont_def;
 if (EQ (rfont_def, Qt))
 return Qnil;
-base_fontset = FONTSET_BASE (fontset);
-/* Try a font-group for C of the default fontset. */
-if (! EQ (base_fontset, Vdefault_fontset))
-{
-if (NILP (FONTSET_DEFAULT (fontset)))
-	FONTSET_DEFAULT (fontset)
-	  = make_fontset (FONTSET_FRAME (fontset), Qnil, Vdefault_fontset);
-rfont_def = fontset_find_font (FONTSET_DEFAULT (fontset), c, face, id, 0);
-if (VECTORP (rfont_def))
-	return (rfont_def);
-}
 /* Try a fallback font-group. */
 rfont_def = fontset_find_font (fontset, c, face, id, 1);
-if (! VECTORP (rfont_def)
+if (VECTORP (rfont_def))
-&& ! EQ (base_fontset, Vdefault_fontset))
+return rfont_def;
-/* Try a fallback font-group of the default fontset . */
+if (EQ (rfont_def, Qt))
-rfont_def = fontset_find_font (FONTSET_DEFAULT (fontset), c, face, id, 1);
+return Qnil;
+base_fontset = FONTSET_BASE (fontset);
+if (EQ (base_fontset, Vdefault_fontset))
+return Qnil;
+/* Try a font-group for C of the default fontset. */
+if (NILP (FONTSET_DEFAULT (fontset)))
+FONTSET_DEFAULT (fontset)
+= make_fontset (FONTSET_FRAME (fontset), Qnil, Vdefault_fontset);
+rfont_def = fontset_find_font (FONTSET_DEFAULT (fontset), c, face, id, 0);
+if (VECTORP (rfont_def))
+return rfont_def;
+/* Try a fallback font-group of the default fontset . */
+rfont_def = fontset_find_font (FONTSET_DEFAULT (fontset), c, face, id, 1);
 if (! VECTORP (rfont_def))
 /* Remeber that we have no font for C.  */
 FONTSET_SET (fontset, make_number (c), Qt);
 return rfont_def;
 /* Cache data used by fontset_pattern_regexp.  The car part is a
 pattern string containing at least one wild card, the cdr part is
 the corresponding regular expression.  */
 static Lisp_Object Vcached_fontset_data;
-#define CACHED_FONTSET_NAME (SDATA (XCAR (Vcached_fontset_data)))
+#define CACHED_FONTSET_NAME ((char *) SDATA (XCAR (Vcached_fontset_data)))
 #define CACHED_FONTSET_REGEX (XCDR (Vcached_fontset_data))
 /* If fontset name PATTERN contains any wild card, return regular
 expression corresponding to PATTERN.  */
 static Lisp_Object
 fontset_pattern_regexp (pattern)
 Lisp_Object pattern;
 {
-if (!index (SDATA (pattern), '*')
+if (!index ((char *) SDATA (pattern), '*')
-&& !index (SDATA (pattern), '?'))
+&& !index ((char *) SDATA (pattern), '?'))
 /* PATTERN does not contain any wild cards.  */
 return Qnil;
 if (!CONSP (Vcached_fontset_data)
-|| strcmp (SDATA (pattern), CACHED_FONTSET_NAME))
+|| strcmp ((char *) SDATA (pattern), CACHED_FONTSET_NAME))
 {
 /* We must at first update the cached data.  */
 unsigned char *regex, *p0, *p1;
 int ndashes = 0, nstars = 0;
 	    *p1++ = *p0;
 	}
 *p1++ = '$';
 *p1++ = 0;
-Vcached_fontset_data = Fcons (build_string (SDATA (pattern)),
+Vcached_fontset_data = Fcons (build_string ((char *) SDATA (pattern)),
-				    build_string (regex));
+				    build_string ((char *) regex));
 }
 return CACHED_FONTSET_REGEX;
 }
 	continue;
 name = FONTSET_NAME (fontset);
 if (STRINGP (regexp)
 	  ? (fast_string_match (regexp, name) < 0)
-	  : strcmp (SDATA (pattern), SDATA (name)))
+	  : strcmp ((char *) SDATA (pattern), (char *) SDATA (name)))
 	continue;
 val = Fcons (Fcopy_sequence (FONTSET_NAME (fontset)), val);
 }
 static INLINE Lisp_Object
 generate_ascii_font_name (name, ascii_spec)
 Lisp_Object name, ascii_spec;
 {
 Lisp_Object font_spec = Ffont_spec (0, NULL);
-Lisp_Object vec;
 int i;
 char xlfd[256];
-if (font_parse_xlfd (SDATA (name), font_spec) < 0)
+if (font_parse_xlfd ((char *) SDATA (name), font_spec) < 0)
 error ("Not an XLFD font name: %s", SDATA (name));
 for (i = FONT_FOUNDRY_INDEX; i < FONT_EXTRA_INDEX; i++)
 if (! NILP (AREF (ascii_spec, i)))
 ASET (font_spec, i, AREF (ascii_spec, i));
 i = font_unparse_xlfd (font_spec, 0, xlfd, 256);
 `set-fontset-font' for the meaning.  */)
 (name, fontlist)
 Lisp_Object name, fontlist;
 {
 Lisp_Object fontset;
-Lisp_Object val;
 int id;
 CHECK_STRING (name);
 CHECK_LIST (fontlist);
 Lisp_Object font_spec = Ffont_spec (0, NULL);
 Lisp_Object short_name;
 char xlfd[256];
 int len;
-if (font_parse_xlfd (SDATA (name), font_spec) < 0)
+if (font_parse_xlfd ((char *) SDATA (name), font_spec) < 0)
 	error ("Fontset name must be in XLFD format");
 short_name = AREF (font_spec, FONT_REGISTRY_INDEX);
-if (strncmp (SDATA (SYMBOL_NAME (short_name)), "fontset-", 8)
+if (strncmp ((char *) SDATA (SYMBOL_NAME (short_name)), "fontset-", 8)
 	  || SBYTES (SYMBOL_NAME (short_name)) < 9)
 	error ("Registry field of fontset name must be \"fontset-*\"");
 Vfontset_alias_alist = Fcons (Fcons (name, SYMBOL_NAME (short_name)),
 				    Vfontset_alias_alist);
 ASET (font_spec, FONT_REGISTRY_INDEX, Qiso8859_1);
 if (NILP (frame))
 frame = selected_frame;
 CHECK_LIVE_FRAME (frame);
 f = XFRAME (frame);
-font_object = font_open_by_name (f, SDATA (name));
+font_object = font_open_by_name (f, (char *) SDATA (name));
 if (NILP (font_object))
 return Qnil;
 font = XFONT_OBJECT (font_object);
 info = Fmake_vector (make_number (7), Qnil);
 EMACS_INT pos, pos_byte, dummy;
 int face_id;
 int c;
 struct frame *f;
 struct face *face;
-Lisp_Object rfont_def;
 int cs_id;
 if (NILP (position))
 {
 CHECK_CHARACTER (ch);

Mercurial > emacs

comparison src/fontset.c @ 95230:fa14617b247e