aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2008-05-23 10:30:18 +0000
committerJuanma Barranquero2008-05-23 10:30:18 +0000
commit20746fe46b2783e66b316f57bb827011d55e8e24 (patch)
tree1da950321268c3e755eddf3a375a2a68ee033781 /src
parentd0cf2d48dc0327eb9e8f0633d5482354911b5288 (diff)
downloademacs-20746fe46b2783e66b316f57bb827011d55e8e24.tar.gz
emacs-20746fe46b2783e66b316f57bb827011d55e8e24.zip
*** empty log message ***
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog56
-rw-r--r--src/fontset.c2
2 files changed, 31 insertions, 27 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 59eca76c30d..77bbfef6620 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,12 @@
12008-05-23 Juanma Barranquero <lekktu@gmail.com>
2
3 * charset.c (Fencode_char, Fsplit_char): Doc fixes.
4 (Fget_unused_iso_final_char, Fdecode_char, Fiso_charset):
5 Fix typos in docstrings.
6
12008-05-23 Jason Rumney <jasonr@gnu.org> 72008-05-23 Jason Rumney <jasonr@gnu.org>
2 8
3 * xsmfns.c: Remove includes that are already included by config.h 9 * xsmfns.c: Remove includes that are already included by config.h.
4 10
52008-05-23 Kenichi Handa <handa@m17n.org> 112008-05-23 Kenichi Handa <handa@m17n.org>
6 12
@@ -24,27 +30,27 @@
24 30
252008-05-22 Jason Rumney <jasonr@gnu.org> 312008-05-22 Jason Rumney <jasonr@gnu.org>
26 32
27 * font.c: Don't include strings.h. 33 * font.c: Don't include strings.h.
28 34
29 * dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp. 35 * dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
30 36
31 * dosfns.c, fileio.c, font.c, fontset.c, image.c, macfns.c: 37 * dosfns.c, fileio.c, font.c, fontset.c, image.c, macfns.c:
32 * macterm.c, process.c, w32.c, w32fns.c, w32proc.c, xfaces.c: 38 * macterm.c, process.c, w32.c, w32fns.c, w32proc.c, xfaces.c:
33 * xfns.c, xfont.c: Callers changed. 39 * xfns.c, xfont.c: Callers changed.
34 40
35 * xfont.c (xfont_list_pattern, compare_font_names): Use xstricmp. 41 * xfont.c (xfont_list_pattern, compare_font_names): Use xstricmp.
36 42
37 * fontset.c (fs_query_fontset): Use xstricmp. 43 * fontset.c (fs_query_fontset): Use xstricmp.
38 44
39 * font.c (font_style_to_value, font_score): Use xstricmp. 45 * font.c (font_style_to_value, font_score): Use xstricmp.
40 46
41 * dosfns.c (msdos_stdcolor_idx): Use xstricmp. 47 * dosfns.c (msdos_stdcolor_idx): Use xstricmp.
42 48
432008-05-22 Kenichi Handa <handa@m17n.org> 492008-05-22 Kenichi Handa <handa@m17n.org>
44 50
45 * puresize.h (BASE_PURESIZE): Increaed to 1220000. 51 * puresize.h (BASE_PURESIZE): Increase to 1220000.
46 52
47 * font.c (font_prop_validate_style): Adjusted for the format 53 * font.c (font_prop_validate_style): Adjust for the format
48 change of font_style_table. 54 change of font_style_table.
49 55
50 * w32font.c (w32font_open_internal): Call Ffont_xlfd_name with 56 * w32font.c (w32font_open_internal): Call Ffont_xlfd_name with
@@ -65,8 +71,8 @@
65 ftfont_list_generic_family. Return a single family for each 71 ftfont_list_generic_family. Return a single family for each
66 generic family. 72 generic family.
67 (ftfont_spec_pattern): Add FC_FAMILY to pattern. 73 (ftfont_spec_pattern): Add FC_FAMILY to pattern.
68 (ftfont_list): Adjust for the change of 74 (ftfont_list): Adjust for the change of ftfont_resolve_generic_family.
69 ftfont_resolve_generic_family. Call font_add_log. 75 Call font_add_log.
70 (ftfont_match): Call font_add_log. 76 (ftfont_match): Call font_add_log.
71 77
72 * font.h (Ffont_xlfd_name): EXFUN adjusted. 78 * font.h (Ffont_xlfd_name): EXFUN adjusted.
@@ -87,12 +93,12 @@
87 93
88 * font.c: Checking of FONT_DEBUG is moved to font.h. All calls of 94 * font.c: Checking of FONT_DEBUG is moved to font.h. All calls of
89 xassert are changed to font_assert. Delete many unused variables. 95 xassert are changed to font_assert. Delete many unused variables.
90 (Vfont_weight_table, Vfont_slant_table, Vfont_width_table): New 96 (Vfont_weight_table, Vfont_slant_table, Vfont_width_table):
91 variables. 97 New variables.
92 (struct table_entry): Move from xfaces.c and modified. 98 (struct table_entry): Move from xfaces.c and modified.
93 (weight_table, slant_table, width_table): Move from xfaces.c and 99 (weight_table, slant_table, width_table): Move from xfaces.c and
94 contents adjusted for the change of struct table_entry. 100 contents adjusted for the change of struct table_entry.
95 (font_style_to_value, font_style_symbolic): Adjusted for the 101 (font_style_to_value, font_style_symbolic): Adjust for the
96 format change of font_style_table. 102 format change of font_style_table.
97 (font_parse_family_registry): Don't overwrite existing foundry and 103 (font_parse_family_registry): Don't overwrite existing foundry and
98 family of font_spec. 104 family of font_spec.
@@ -100,8 +106,8 @@
100 (font_sort_entites): Call font_add_log. 106 (font_sort_entites): Call font_add_log.
101 (font_delete_unmatched): Return a newly created list. 107 (font_delete_unmatched): Return a newly created list.
102 (font_list_entities): Fix previous change. Call font_add_log. 108 (font_list_entities): Fix previous change. Call font_add_log.
103 (font_matching_entity, font_open_entity, font_close_entity): Call 109 (font_matching_entity, font_open_entity, font_close_entity):
104 font_add_log. 110 Call font_add_log.
105 (Ffont_xlfd_name): New arg FOLD-WILDCARDS. 111 (Ffont_xlfd_name): New arg FOLD-WILDCARDS.
106 (Finternal_set_font_style_table): Delete. 112 (Finternal_set_font_style_table): Delete.
107 (BUILD_STYLE_TABLE): New macro. 113 (BUILD_STYLE_TABLE): New macro.
@@ -136,8 +142,8 @@
136 142
1372008-05-20 Jason Rumney <jasonr@gnu.org> 1432008-05-20 Jason Rumney <jasonr@gnu.org>
138 144
139 * w32font.c (add_font_entity_to_list): Don't add non-opentype 145 * w32font.c (add_font_entity_to_list): Don't add non-opentype
140 truetype fonts to opentype list. 146 truetype fonts to opentype list.
141 147
1422008-05-20 Juanma Barranquero <lekktu@gmail.com> 1482008-05-20 Juanma Barranquero <lekktu@gmail.com>
143 149
@@ -401,8 +407,7 @@
401 (enable_font_backend, font_symbolic_weight, font_symbolic_slant) 407 (enable_font_backend, font_symbolic_weight, font_symbolic_slant)
402 (font_symbolic_width, font_find_object, font_get_spec) 408 (font_symbolic_width, font_find_object, font_get_spec)
403 (font_set_lface_from_name): Delete extern. 409 (font_set_lface_from_name): Delete extern.
404 (Fcopy_font_spec, Fmerge_font_spec, Ffont_family_list): New 410 (Fcopy_font_spec, Fmerge_font_spec, Ffont_family_list): New EXFUNs.
405 EXFUNs.
406 411
407 * font.c: Include <strings.h>. 412 * font.c: Include <strings.h>.
408 (enable_font_backend): Delete it. 413 (enable_font_backend): Delete it.
@@ -414,8 +419,7 @@
414 (font_family_alist): Delete it. 419 (font_family_alist): Delete it.
415 (Qnormal): Extern it. 420 (Qnormal): Extern it.
416 (QCextra, QClanguage): Delete it. 421 (QCextra, QClanguage): Delete it.
417 (QClang, QCavgwidth, QCfont_entity, QCfc_unknown_spec): New 422 (QClang, QCavgwidth, QCfont_entity, QCfc_unknown_spec): New variables.
418 variables.
419 (font_make_spec, font_make_entity, font_make_object) 423 (font_make_spec, font_make_entity, font_make_object)
420 (font_intern_prop): Renamed from intern_downcase. Don't downcase 424 (font_intern_prop): Renamed from intern_downcase. Don't downcase
421 the string. Callers changed. 425 the string. Callers changed.
@@ -429,7 +433,7 @@
429 (font_prop_validate_symbol): Don't return null_string. 433 (font_prop_validate_symbol): Don't return null_string.
430 (font_prop_validate_style): Adjusted for the change of 434 (font_prop_validate_style): Adjusted for the change of
431 style-related values in a font vector. 435 style-related values in a font vector.
432 (font_property_table): Delete entries for QClangauge and 436 (font_property_table): Delete entries for QClanguage and
433 QCantialias, add entries for QCavgwidth. 437 QCantialias, add entries for QCavgwidth.
434 (get_font_prop_index): Delete the 2nd argument FROM. 438 (get_font_prop_index): Delete the 2nd argument FROM.
435 (font_prop_validate): Arguments changed. 439 (font_prop_validate): Arguments changed.
diff --git a/src/fontset.c b/src/fontset.c
index 264be229f38..bafe1ca2255 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -384,7 +384,7 @@ fontset_compare_rfontdef (val1, val2)
384/* Update FONT-GROUP which has this form: 384/* Update FONT-GROUP which has this form:
385 [ CHARSET-ORDERED-LIST-TICK PREFERRED-RFONT-DEF 385 [ CHARSET-ORDERED-LIST-TICK PREFERRED-RFONT-DEF
386 RFONT-DEF0 RFONT-DEF1 ... ] 386 RFONT-DEF0 RFONT-DEF1 ... ]
387 Reorder RFONT-DEFs according to the current langauge, and update 387 Reorder RFONT-DEFs according to the current language, and update
388 CHARSET-ORDERED-LIST-TICK. 388 CHARSET-ORDERED-LIST-TICK.
389 389
390 If PREFERRED_FAMILY is not nil, that family has the higher priority 390 If PREFERRED_FAMILY is not nil, that family has the higher priority