Commit 7c3d233d authored by YAMAMOTO Mitsuharu's avatar YAMAMOTO Mitsuharu
Browse files

(xlfdpat_block_match_1): Fix assertion.

(init_font_name_table) [TARGET_API_MAC_CARBON]: Don't add style
variants for a scalable font multiple times.
parent 0278364c
2005-09-22 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* macterm.c (xlfdpat_block_match_1): Fix assertion.
(init_font_name_table) [TARGET_API_MAC_CARBON]: Don't add style
variants for a scalable font multiple times.
2005-09-21 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
 
* process.c (create_process) [RTU || UNIPLUS || DONT_REOPEN_PTY]:
......
......@@ -6277,7 +6277,7 @@ static INLINE int
xlfdpat_exact_p (pat)
struct xlfdpat *pat;
{
return (pat)->blocks == NULL;
return pat->blocks == NULL;
}
/* Return the first string in STRING + 0, ..., STRING + START_MAX such
......@@ -6295,7 +6295,7 @@ xlfdpat_block_match_1 (blk, string, start_max)
xassert (blk->len > 0);
xassert (start_max + blk->len <= strlen (string));
xassert (blk->pattern[blk->len - 1] != '?');
xassert (blk->last_char != '?');
/* See the comments in the function `boyer_moore' (search.c) for the
use of `infinity'. */
......@@ -6683,28 +6683,29 @@ init_font_name_table ()
{
Lisp_Object rest = XCDR (XCDR (text_encoding_info));
for (; !NILP (rest); rest = XCDR (rest))
{
char *cs = SDATA (XCAR (rest));
if (size > 0 || style == normal)
for (; !NILP (rest); rest = XCDR (rest))
{
char *cs = SDATA (XCAR (rest));
if (size == 0)
{
add_font_name_table_entry (mac_to_x_fontname (name, size,
style, cs));
add_font_name_table_entry (mac_to_x_fontname (name, size,
italic, cs));
add_font_name_table_entry (mac_to_x_fontname (name, size,
bold, cs));
add_font_name_table_entry (mac_to_x_fontname (name, size,
italic | bold,
cs));
}
else
{
add_font_name_table_entry (mac_to_x_fontname (name, size,
style, cs));
}
}
if (size == 0)
{
add_font_name_table_entry (mac_to_x_fontname (name, size,
style, cs));
add_font_name_table_entry (mac_to_x_fontname (name, size,
italic, cs));
add_font_name_table_entry (mac_to_x_fontname (name, size,
bold, cs));
add_font_name_table_entry (mac_to_x_fontname (name, size,
italic | bold,
cs));
}
else
{
add_font_name_table_entry (mac_to_x_fontname (name, size,
style, cs));
}
}
}
}
......
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