1 2006-11-07 Bob Halley <halley@play-bow.org>
3 * ccl.c (ccl_driver): If DST is NULL, set ccl->produced to 0.
5 2006-10-31 Kenichi Handa <handa@m17n.org>
7 * xdisp.c (get_next_display_element): Set it->face_id for the
8 first component of a composition.
9 (x_produce_glyphs): Check if the font is changed or not for
12 2006-10-31 Kenichi Handa <handa@m17n.org>
14 (get_next_display_element): Set it->face_id for the
15 first component of a composition.
16 (x_produce_glyphs): Check if the font is changed or not for
19 2006-10-30 Kenichi Handa <handa@m17n.org>
21 * fontset.c (Qlatin): New variable.
22 (syms_of_fontset): Define it as a lisp symbol.
23 (Fset_fontset_font): If TARGET is `latin', use FONT_SPEC for
26 2006-10-27 Kenichi Handa <handa@m17n.org>
28 * font.c (font_unparse_fcname): Pay attention to the case that
29 some of font property is a null string.
31 2006-10-26 Kenichi Handa <handa@m17n.org>
33 * term.c: Include "composite.h".
34 (encode_terminal_code): Output all components of composition.
35 Check the size of encode_terminal_src.
36 (produce_glyphs): For compostion, call produce_composite_glyph.
37 (append_composite_glyph, produce_composite_glyph): New functions.
39 * xdisp.c (x_produce_glyphs): In handling composition, if a font
40 is not found, get font_info from the current ascii face.
42 2006-10-23 Kenichi Handa <handa@m17n.org>
44 * fileio.c (Finsert_file_contents): On replacing, temporarily bind
45 buffer-file-name to Qnil before calling insert_from_buffer.
47 * font.c (font_unparse_fcname): Pay attention to the case that
48 foundry is a null string.
50 2006-10-17 Kenichi Handa <handa@m17n.org>
52 * ftfont.c (ftfont_list): Allow registry "unicode-sip".
54 * font.c (Qunicode_sip): New variable.
55 (syms_of_font): Declare it as a Lisp symbol.
57 * font.h (Qunicode_sip): Extern it.
59 2006-10-16 Kenichi Handa <handa@m17n.org>
61 * composite.c (get_composition_id): Pay attention to TAB
64 * xterm.c (x_draw_composite_glyph_string_foreground): Don't draw
65 TAB. Adjusted for the change of s->char2b which always points to
66 the first elememnt of allocated memory.
68 * xftfont.c (xftfont_text_extents): Fix calculation of descent
71 * xdisp.c (handle_composition_prop): Set it->c to the first
73 (fill_composite_glyph_string): Argument changed.
74 (BUILD_COMPOSITE_GLYPH_STRING): Adjusted for the above change.
75 (x_produce_glyphs): Fix handling of left/right padding.
77 2006-10-04 Kenichi Handa <handa@m17n.org>
79 * regex.c (analyse_first): Cancel the change for synching with
82 2006-08-28 Kenichi Handa <handa@m17n.org>
84 * coding.c (detect_coding_system): Fix for handling off
85 inhibit_iso_escape_detection. Fix for the case that no coding
86 system is defined for a specific coding category.
88 2006-08-21 Kenichi Handa <handa@m17n.org>
90 * font.c (font_matching_entity): Dolete unused local var.
92 * xftfont.c (xftfont_open): Call XftDefaultSubstitute before
95 * fileio.c (Finsert_file_contents): On recovering a file, assume
97 (choose_write_coding_system): On auto-saving a file, force
100 * coding.c (setup_coding_system): Fix setting of
101 coding->common_flags based on eol_type.
102 (coding_inherit_eol_type): If PARENT is not nil, be sure to
105 2006-08-04 Kenichi Handa <handa@m17n.org>
107 * alloc.c (NSTATICS): Increased to 0x600.
109 2006-08-01 Kenichi Handa <handa@m17n.org>
111 * ftfont.c (ftfont_driver): Set ftfont_driver.match to
113 (ftfont_list): Don't check :name property.
114 (ftfont_match): New function.
115 (ftfont_pattern_entity): If the pattern doesn't contain
116 FC_SPACING, don't assuce FC_MONO.
118 * font.h (struct font_driver): New member `match'.
119 (font_update_drivers): Prototype adjusted.
121 * font.c (font_parse_fcname): Don't change :name property of FONT.
122 (font_parse_name): Likewise.
123 (LGSTRING_HEADER_SIZE, LGSTRING_GLYPH_SIZE, check_gstring): Define
124 them unconditionally.
125 (font_matching_entity): New function.
126 (font_open_by_name): Try font_matching_entity if exact match is
128 (font_update_drivers): Delete the arg FONT. Return a list of
129 actually used backends. Don't free faces, font caches here.
130 Don't store data in frame parameters. Don't call x_set_font.
131 (Ffont_spec): Store :name property as is.
132 (Ffont_get): Check HAVE_LIBOTF before calling font_otf_capability.
133 (Ffont_otf_gsub): Call font->driver->otf_gsub instead of
135 (Ffont_otf_gpos): Call font->driver->otf_gpos instead of
137 (Ffont_otf_alternates): Check if the driver has otf_gsub function.
138 Call font->driver->otf_gsub instead of font_otf_gsub.
140 * frame.c (x_set_font_backend): Do more works that were done in
141 font_update_drivers before.
143 * xfont.c (xfont_match): New function.
144 (xfont_driver): Set xfont_driver.match to xfont_match.
145 (xfont_draw): Set font in GC if necessary.
147 * ftxfont.c (ftxfont_match): New function.
148 (syms_of_ftxfont): Set ftxfont_driver.match to ftxfont_match.
150 * xftfont.c (xftfont_match): New function.
151 (syms_of_xftfont): Set xftfont_driver.match to xftfont_match.
153 2006-07-28 Kenichi Handa <handa@m17n.org>
155 * font.h (struct font): New member scalable.
156 (struct font_driver): New arg ALTERANTE_SUBST to otf_gsub.
157 (font_otf_gsub): Prototype adjusted.
159 * font.c (font_otf_capability): Fix handling of the default
161 (parse_gsub_gpos_spec): Type changed to void. New arg nbytes.
162 Check the contents of SPEC.
163 (LGSTRING_HEADER_SIZE, LGSTRING_GLYPH_SIZE): New macros.
164 (check_gstring): New function.
165 (REPLACEMENT_CHARACTER): New macro.
166 (font_otf_gsub): New arg alternate_subst. Be sure to set all
167 glyph codes of GSTRING.
168 (font_otf_gpos): Be sure to set all glyph codes of GSTRING.
169 (font_prepare_composition): Set cmp->glyph_len.
170 (font_open_entity): Set font->scalable.
171 (Ffont_get): Handle :otf property.
172 (Ffont_otf_gsub, Ffont_otf_gpos, Ffont_otf_alternates): New
174 (Fquery_font): Use font->font.full_name.
175 (syms_of_font): Defsubr Sfont_otf_gsub, Sfont_otf_gpos, and
176 Sfont_otf_alternates.
178 * ftfont.c (ftfont_open): Set font->font.full_name and
179 font->font.name properly. Fix calculation of font->font.height
182 * ftxfont.c (ftxfont_create_gcs): New function.
183 (ftxfont_draw_bitmap): Fix arg to ftfont_driver.get_bitmap.
184 (ftxfont_draw_backgrond): Fix filling region.
185 (ftxfont_default_fid): New function.
186 (ftxfont_open): Set xfotn->fid to the return value of
188 (ftxfont_prepare_face): Use ftxfont_create_gcs to create GCs.
189 (ftxfont_done_face): Free only GCs that are created by
191 (ftxfont_draw): If face->gc != s->gc, create proper GCs.
193 * xterm.c (x_set_glyph_string_clipping_exactly) [USE_FONT_BACKEND]:
194 Clip to src->width, etc (not src->clip_XXX).
196 * xfns.c (x_create_tip_frame) [USE_FONT_BACKEND]: Handle
197 FontBackend frame parameter.
199 2006-07-26 Kenichi Handa <handa@m17n.org>
201 * font.h (struct font_driver_list): New member `on'.
202 (Fclear_font_cache): EXFUN it.
203 (font_update_drivers): Extern it.
205 * font.c (font_unparse_fcname): Fix typo (swidth->width).
206 (font_list_entities): Check driver_list->on.
207 (register_font_driver): Initalize `on' member to 0.
208 (font_update_drivers): New function.
209 (Fclear_font_cache): Check driver_list->on.
211 * frame.h (Qfont_backend): Extern it.
212 (x_set_font_backend): Extern it.
214 * frame.c (Qfont_backend): New variable.
215 (frame_parms): New element for font-backend.
216 (x_set_font_backend): New function.
218 * xfns.c (Fx_create_frame) [USE_FONT_BACKEND]: Handle
219 FontBackend frame parameter.
220 (x_frame_parm_handlers) [USE_FONT_BACKEND]: New element
223 * xfont.c (xfont_list): Don't try listing by :name property if the
224 name is not for XLFD.
226 2006-07-24 Kenichi Handa <handa@m17n.org>
228 * font.h (LGLYPH_FROM, LGLYPH_TO, LGLYPH_SET_FROM)
229 (LGLYPH_SET_TO): New macros.
230 (LGLYPH_XOFF, LGLYPH_YOFF, LGLYPH_WADJUST): Check if adjustment
231 element of G is vector or not.
232 (font_at): Extern it.
234 * font.c: Include window.h.
235 (font_lispy_object): New function.
236 (font_prepare_composition): Check LGLYPH_FORM (g) to detect the
238 (font_close_object): Fix getting (struct font *).
239 (font_at): New function.
240 (Ffont_get): If FONT is a font-object, get entity from it.
241 (Ffont_make_gstring): Initialize elements of glyphs with nil.
242 (Ffont_fill_gstring): Use macro LGSTRING_XXX and LGLYPH_XXX. Fix
244 (Ffont_at): New function.
245 (syms_of_font): Defsubr Sfont_at.
247 * xdisp.c (it_props): Move the entry for Qauto_composed to just
248 before the entry for Qcompostion.
249 (handle_auto_composed_prop): Call auto-composition-function with 4
251 (handle_composition_prop) [USE_FONT_BACKEND]: Set it->face_id from
253 (fill_composite_glyph_string) [USE_FONT_BACKEND]: Check
254 LGLYPH_FORM (g) to detect the end of valid glyph.
255 (x_produce_glyphs) [USE_FONT_BACKEND]: Don't update it->face_id if
256 we are composing with gstring.
258 * xterm.c (x_draw_composite_glyph_string_foreground) [USE_FONT_BACKEND]:
259 Check if adjustment is vector or not.
261 * Makefile.in (font.o): Make it depends on window.h.
263 2006-07-24 Kenichi Handa <handa@m17n.org>
265 * xterm.c (x_draw_composite_glyph_string_foreground): Check if
266 adjustment is vector or not.
268 2006-07-20 Kenichi Handa <handa@m17n.org>
270 * casefiddle.c (casify_object): Sync with HEAD.
272 2006-07-18 Miles Bader <miles@gnu.org>
274 * character.h (CHECK_CHARACTER): Redefine in terms of CHECK_TYPE.
276 2006-07-14 Kenichi Handa <handa@m17n.org>
278 * font.h (LGLYPH_XOFF, LGLYPH_YOFF, LGLYPH_WIDTH, LGLYPH_WADJUST)
279 (LGLYPH_SET_WIDTH): Adjusted for the change of LGLYPH format.
280 (LGLYPH_ADJUSTMENT, LGLYPH_SET_ADJUSTMENT): New macros.
282 * font.c (font_merge_old_spec): Treat '*' in foundry as a wild
284 (DEVICE_DELTA): Fix typo.
285 (font_otf_gpos): Adjusted for the change of LGLYPH format.
286 (font_prepare_composition): Likewise.
288 * xterm.c (x_draw_composite_glyph_string_foreground): Adjusted for
289 the change of LGLYPH format.
291 2006-07-07 Kenichi Handa <handa@m17n.org>
293 * ftfont.c (ftfont_list): Fix typo.
294 (ftfont_build_basic_charsets): Don't include letters with
297 2006-07-09 Jan Dj
\e,Ad
\e(Brv <jan.h.d@swipnet.se>
299 * xfaces.c (realize_non_ascii_face): Set face->extra to NULL.
301 * xftfont.c (xftfont_done_face): Call XftDrawDestroy only if
302 xftface_info is non-NULL.
304 2006-07-07 Kenichi Handa <handa@m17n.org>
306 * ftfont.c (ftfont_list): Fix typo.
307 (ftfont_build_basic_charsets): Don't include letters with
310 2006-07-05 Jan Dj
\e,Ad
\e(Brv <jan.h.d@swipnet.se>
312 * ftfont.c (ftfont_list): Move misplaced #endif
314 2006-07-05 Kenichi Handa <handa@m17n.org>
316 * ftfont.c (ftfont_list): Pay attention to the case that
317 FC_CAPABILITY is not defined.
319 2006-07-03 Kenichi Handa <handa@m17n.org>
321 * xftfont.c (xftfont_open): Set charset related members to -1.
323 * ftfont.c (ftfont_list): Handle QCotf property. Handling of
325 (ftfont_open): Set charset related members to -1.
327 * fontset.c (Votf_script_alist): New variable.
328 (syms_of_fontset): Initialize it.
329 (fontset_font): Delete unused variable.
331 * fontset.h (Votf_script_alist): Extern it.
333 * font.c (font_find_for_lface): Code optimized.
335 * font.h (font_close_object, font_merge_old_spec): Extern them.
337 2006-06-28 Kenichi Handa <handa@m17n.org>
339 * font.c (QCscalable, Qc, Qm, Qp, Qd): New variables.
340 (syms_of_font): Initialize them.
341 (font_pixel_size): Allow float value in dpi.
342 (font_prop_validate_type): Deleted.
343 (font_prop_validate_symbol, font_prop_validate_style): Argument
344 changed. Caller changed.
345 (font_prop_validate_non_neg): Renamed from
346 font_prop_validate_size.
347 (font_prop_validate_extra): Deleted.
348 (font_prop_validate_spacing): New function.
349 (font_property_table): Add elements for all known properties.
350 (get_font_prop_index): Renamed from check_font_prop_name. New
351 argument FROM. Caller changed.
352 (font_prop_validate): Validate all known properties.
353 (font_put_extra): Argument force deleted. Caller changed.
354 (font_expand_wildcards): Make it static. Fix the way of shrinking
356 (font_parse_xlfd): Arguemnt merge deleted. Fix handling of RESX,
357 RESY, SPACING, and AVGWIDTH. Don't validate property values here.
359 (font_unparse_xlfd): Handle dpi, spacing, and scalable properties.
360 (font_parse_fcname): Arguemnt merge deleted. Fix parsing of point
361 size. Don't validate properties values here. Caller changed.
362 (font_unparse_fcname): Handle dpi, spacing, and scalable
364 (font_open_by_name): Delete unused variable.
365 (Ffont_spec): Likewise. Validate property values.
366 (Ffont_match_p): New function.
368 * font.h (QCscalable): Extern it.
369 (font_parse_xlfd, font_parse_fcname): Prototype adjusted.
371 * ftfont.c (ftfont_list): Handle properties dpi, spacing, and
374 * xfont.c (xfont_query_font): Adjusted for the change of
376 (xfont_list_pattern): New function.
377 (xfont_list): Use xfont_list_pattern.
379 * xftfont.c (xftfont_prepare_face): Cancel previous change.
380 (xftfont_done_face): Likewise.
382 2006-06-26 Kenichi Handa <handa@m17n.org>
384 * font.h (Flist_fonts): EXFUN it.
386 2006-06-25 Jason Rumney <jasonr@gnu.org>
388 * w32term.c (w32_initialize): Add back smoothing_type and
389 smoothing_enabled definitions.
391 2006-06-23 Kenichi Handa <handa@m17n.org>
393 * xterm.c (x_draw_glyph_string) [USE_FONT_BACKEND]: Check
394 s->face->font on determining underline position.
396 2006-06-21 Kenichi Handa <handa@m17n.org>
398 * font.c (font_parse_xlfd): Fix generating of CHARSET_REGISTRY field.
399 (font_has_char): Accept font-object too.
400 (font_find_for_lface): Try at first with a size specified in face.
402 * xftfont.c (xftfont_prepare_face): Make non-ascii face share
403 face->extra with ascii face.
404 (xftfont_done_face): Don't free face->extra of non-ascii face.
406 2006-06-20 Kenichi Handa <handa@m17n.org>
408 * frame.c (x_set_font) [USE_FONT_BACKEND]: Fix argument to
411 2006-06-19 Kenichi Handa <handa@m17n.org>
413 * font.h (QCspacing, QCdpi): Extern them.
414 (enum font_spacing): New enum.
415 (FONT_PIXEL_SIZE_QUANTUM): New macro.
417 * font.c (POINT_TO_PIXEL): Don't divice POINT by 10.
418 (QCspacing, QCdpi): New variables.
419 (syms_of_font): Initialize them.
420 (font_pixel_size): New function.
421 (font_put_extra): New function.
422 (font_parse_xlfd): Fix handling of font size. Add QCdpi property
424 (font_parse_fcname): Handle enumenrated values (e.g. bold). Fix
425 handling font size. Add QCname property that contains only
427 (font_score): Change argument. Caller changed. Pay attention to
428 FONT_PIXEL_SIZE_QUANTUM.
429 (font_sort_entites): Fix handling of font size.
430 (font_list_entities): Likewise.
431 (font_find_for_lface): Likewise.
432 (font_open_for_lface): Likewise.
433 (font_open_by_name): Likewise.
434 (Ffont_spec): Add QCname property that contains only unknown
437 * ftfont.c (ftfont_list): Use assq_no_quit, not Fassq. Don't
438 include weight in listing pattern, instead check weight of each
439 listed font. Don't include scalable in pattern. Pay attention to
440 FONT_PIXEL_SIZE_QUANTUM.
442 2006-06-19 Kenichi Handa <handa@m17n.org>
444 * lread.c (read_escape): Fix the code synched with HEAD.
446 * font.c (font_parse_fcname): Fix parsing of point-size.
447 (font_unparse_fcname): Produce symbolic names for style
449 (font_list_entities): Handle float size correctly.
450 (font_open_by_name): Prefer `normal' property values if the name
451 doesn't specify them.
453 * fontset.c (Finternal_char_font): Use font_get_name, not
456 * ftfont.c (ftfont_pattern_entity): Use the numeric value 100 for
457 FC_WEIGHT_REGULAR. Exclude FC_SIZE and FC_PIXEL_SIZE from listing
458 pattern. Don't force scalable.
460 * xftfont.c (xftfont_open): For generating a name, start from
463 2006-06-16 Jan Dj
\e,Ad
\e(Brv <jan.h.d@swipnet.se>
465 * frame.h (x_new_fontset2): Fix prototype.
467 2006-06-16 Kenichi Handa <handa@m17n.org>
469 * font.h (struct font_driver): Member parse_name deleted.
470 (font_match_p, font_get_spec, font_parse_fcname)
471 (font_unparse_fcname): Extern them.
472 (font_get_name): Prototype adjusted.
474 * font.c (XLFD_SMALLNUM_MASK): Delete this macro.
475 (XLFD_LARGENUM_MASK): Delete XLFD_ENCODING_MASK from it.
476 (font_expand_wildcards): Fix handling ENCODING field. Avoid
477 unnecessary checks for weight, slant, and swidth.
478 (font_parse_fcname): New function.
479 (font_unparse_fcname): New function.
480 (font_parse_name): New function.
481 (font_match_p): New function.
482 (font_get_name): Return value changed to Lisp string.
483 (font_get_spec): New function.
484 (Qunspecified, Qignore_defface): Don't extern them.
485 (font_find_for_lface): Assume that LFACE is fully specified.
486 (font_load_for_face): If lface[LFACE_FONT_INDEX] is an font
487 object, use it for FACE.
488 (font_open_by_name): Call Ffont_spec with QCname prop. Don't call
490 (Ffont_spec): Call font_parse_name, not font_parse_xlfd.
492 * fontset.h (new_fontset_from_font) [USE_FONT_BACKEND]: Prototype
495 * fontset.c (new_fontset_from_font) [USE_FONT_BACKEND]: Argument F
496 deleted. Don't call Fnew_fontset. Instead, directly call
499 * frame.h (x_new_fontset2) [USE_FONT_BACKEND]: Prototype adjusted.
501 * frame.c (x_set_font) [USE_FONT_BACKEND]: Adjusted for the change
504 * ftfont.c (Qmonospace, Qsans_serif, Qserif, Qmono, Qsans)
505 (Qsans__serif): New variables.
506 (ftfont_generic_family_list): New variable.
507 (syms_of_ftfont): Initialize the above variables.
508 (ftfont_pattern_entity): Argument NAME deleted.
509 (ftfont_list_generic_family): New function.
510 (ftfont_parse_name): Delete this function.
511 (ftfont_list): Try generic family only when FcFontList found no
513 (ftfont_list_family): Fix args to FcObjectSetBuild.
515 * xfaces.c (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
516 object in attrs[LFACE_FONT_INDEX].
517 (set_lface_from_font_name): Cancel all changes for font-backend.
518 (set_lface_from_font_and_fontset) [USE_FONT_BACKEND]: New
520 (Finternal_set_lisp_face_attribute) [USE_FONT_BACKEND]: Accept a
521 font object in QCfont attribute.
522 (set_font_frame_param) [USE_FONT_BACKEND]: Likewise.
523 (realize_default_face) [USE_FONT_BACKEND]: Call
524 set_lface_from_font_and_fontset.
526 * xfns.c (x_default_font_parameter) [USE_FONT_BACKEND]: Try also
527 "fixed", and signal error here if no suitable font was found.
529 * xfont.c (xfont_parse_name): Delete this function.
531 * xftfont.c (xftfont_open): Change coding style of error
532 handling. Generate fontconfig's fontname pattern.
534 * xterm.h (struct x_output) [USE_FONT_BACKEND]: New member fontp.
535 (FRAME_FONT_OBJECT) [USE_FONT_BACKEND]: New macro.
537 * xterm.c (x_new_fontset2) [USE_FONT_BACKEND]: Change arguments.
538 Both args FONTSET and FONT_OBJECT must be existing ones.
540 2006-06-16 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
542 * macterm.c (mac_set_unicode_keystroke_event): Don't use MAKE_CHAR.
544 2006-06-14 Kenichi Handa <handa@m17n.org>
546 * xfont.c (xfont_open, xfont_encode_char): Fix typo.
548 * font.h (struct font): Fix typo.
550 * font.c (enum xlfd_field_index): Rename XLFD_XXX_SIZE_INDEX to
552 (enum xlfd_field_mask): New enum.
553 (intern_font_field): Argument changed. Caller changed. If digits
554 are followed by non-digits, return a symbol.
555 (font_expand_wildcards): New function.
556 (font_parse_xlfd): Fix wildcard handling.
557 (Ffont_spec): If :name is specified, reflect the info in the other
560 * ftfont.c (ftfont_pattern_entity): Fix typo.
561 (ftfont_list): Enforce FC_LANG in PATTERN to cancel the effect of
564 2006-06-09 Kenichi Handa <handa@m17n.org>
566 * font.h (Qiso8859_1, Qiso10646_1, Qunicode_bmp): Extern them.
568 * font.c (Qiso8859_1, Qiso10646_1, Qunicode_bmp): Moved from
570 (font_unparse_xlfd): Fix argument type declaration. Append "*" if
571 registry doesn't specify encoding part.
572 (font_find_for_lface): Pay attention to LFACE_FONT_INDEX.
573 (font_open_by_name): At first try parsing the name.
574 (syms_of_font): Declare Qiso8859_1, Qiso10646_1, and Qunicode_bmp
577 * fontset.c (reorder_font_vector): Pay attention to the case that
578 the 3rd element of font_def is nil.
579 (fontset_font): For the default fontset, append one more fontset
580 elements for a script-based font specification. Don't add script
581 attribute on finding a font.
582 (new_fontset_from_font): Unconditionally set FONTSET_ASCII to the
584 (fontset_ascii_font): If a font can't be opened, return nil.
586 * ftfont.c (Qiso8859_1, Qiso10646_1, Qunicode_bmp): Moved to
588 (ftfont_pattern_entity): New function.
589 (ftfont_get_cache): Assume that freetype_font_cache is already
591 (ftfont_list): Handle the case that a file is specified in font
592 name. Use ftfont_pattern_entity to generate entities.
593 (ftfont_has_char): Check if the pattern contains FC_CHARSET.
594 (syms_of_ftfont): Initialize freetype_font_cache.
596 * xftfont.c (xftfont_open): Make the font name fontconfig's
597 style. Add BLOCK_INPUT and UNBLOCK_INPUT.
598 (xftfont_close): Free font->font.name if not NULL.
600 * xfont.c (xfont_list): If script is specified for a font, return
602 (xfont_list_family): Declare argument type.
604 * xfaces.c (set_lface_from_font_name): If a font doesn't have a
605 name, set LFACE_FONT (lface) to nil.
607 * xterm.c (x_new_fontset2): If an ASCII font couldn't be loaded,
610 2006-06-08 Jason Rumney <jasonr@gnu.org>
612 * w32term.c (w32_initialize): Manually sync 2006-06-05 change from
615 2006-06-08 Kenichi Handa <handa@m17n.org>
617 * emacs.c (main): Check -enable-font-backend arg after the check
619 (standard_args): Add "-enable-font-backend".
621 * coding.c (Ffind_operation_coding_system): Sync with HEAD.
623 * callproc.c (Fcall_process): Sync with HEAD.
625 * coding.h (CODING_REQUIRE_ENCODING): Comment sync with HEAD.
627 2006-06-07 Kenichi Handa <handa@m17n.org>
629 * xftfont.c (xftfont_default_fid): Set fid_known to 1.
630 (struct xftdraw_list, xftdraw_list): Delete them.
631 (register_xftdraw, check_xftdraw): Delete them.
632 (xftfont_prepare_face): Don't call register_xftdraw.
633 (xftfont_done_face): Don't call check_xftdraw.
634 (xftfont_draw): Get backroudn color only when with_background is
637 * xfont.c (xfont_encode_char): Fix calculation of char2b.
639 2006-06-06 Kenichi Handa <handa@m17n.org>
641 These changes are for the new font handling codes.
643 * Makefile.in (ALL_CFLAGS): Add @FREETYPE_CFLAGS@,
644 @FONTCONFIG_CFLAGS@, and @LIBOTF_CFLAGS@.
645 (LIB_X11_LIB): If HAVE_XFT is defined, set to @XFT_LIBS@.
646 (FONTSRC, FONTOBJ): New variables.
647 (obj): Add $(FONTOBJ).
648 (SOME_MACHINE_OBJECTS): Lib_X11_Lib.
649 (LIBES): Add @FREETYPE_LIBS@, @FONTCONFIG_LIBS@, and
651 (font.o, ftfont.o, xfont.o, xftfont.o, ftxfont.o): New targets.
652 (fontset.o, xdisp.o, xfaces.o, xfns.o, xterm.o): Depends on
655 * font.h, font.c, xfont.c, ftfont.c, xftfont.c, ftxfont.c: New
658 * character.h (Vscript_representative_chars): Extern it.
660 * character.c (Vscript_representative_chars): New variable.
661 (syms_of_character): Declare it as a Lisp variable.
663 * composite.c (get_composition_id) [USE_FONT_BACKEND]: If
664 enable_font_backend is nonzero, accept the composition method
665 COMPOSITION_WITH_GLYPH_STRING.
667 * composite.h (enum composition_method) [USE_FONT_BACKEND]: New
668 enumeration COMPOSITION_WITH_GLYPH_STRING.
670 * config.in: Re-generated.
672 * dispextern.h (struct glyph_string) [USE_FONT_BACKEND]: New
673 members clip_x, clip_y, clip_width, and clip_height.
674 (struct face) [USE_FONT_BACKEND]: New members font_info and extra.
676 * emacs.c (main) [USE_FONT_BACKEND]: Handle arg
677 --enable-font-backend. Call syms_of_font.
679 * fns.c (assoc_no_quit): New function.
681 * fontset.h (FONT_INFO_FROM_FACE): New macro.
682 (face_for_font, new_fontset_from_font)
683 (fontset_ascii_font) [USE_FONT_BACKEND]: Extern them.
685 * fontset.c [USE_FONT_BACKEND]: Include "font.h".
686 (fontset_font, fontset_ascii, face_for_char)
687 (make_fontset_for_ascii_face, Ffont_info)
688 (Finternal_char_font) [USE_FONT_BACKEND]: If enable_font_backend
689 is nonzero, use font-backend mechanism.
690 (find_font_encoding): Make it non-static.
691 (new_fontset_from_font, fontset_ascii_font) [USE_FONT_BACKEND]:
694 * frame.h (struct frame): New members resx and resy.
695 (struct frame) [USE_FONT_BACKEND]: New member font_driver_list.
696 (x_new_fontset2) [USE_FONT_BACKEND]: Extern it.
698 * frame.c [USE_FONT_BACKEND]: Include "font.h".
699 (make_frame, x_set_font) [USE_FONT_BACKEND]: Use font-backend
702 * lisp.h (assoc_no_quit): Extern it.
704 * xdisp.c: If USE_FONT_BACKEND is defined, include "font.h".
705 Through out the file, use FONT_INFO_FROM_FACE instead of
706 FONT_INFO_FROM_ID, use get_per_char_metric instead of
707 rif->per_char_metric.
708 (handle_composition_prop) [USE_FONT_BACKEND]: If the composition
709 method is COMPOSITION_WITH_GLYPH_STRING, just set it->c to ' '.
710 (get_glyph_face_and_encoding, fill_composite_glyph_string)
711 (get_char_face_and_encoding, BUILD_COMPOSITE_GLYPH_STRING)
712 (x_produce_glyphs) [USE_FONT_BACKEND]: If enable_font_backend is
713 nonzero, use font-backend mechanism.
714 (get_per_char_metric): New function.
716 * xfaces.c [USE_FONT_BACKEND]: Include "font.h".
717 (set_lface_from_font_name)
718 (set_font_frame_param, free_realized_face)
719 (prepare_face_for_display, clear_face_gcs)
720 (Finternal_set_font_selection_order, realize_x_face)
721 [USE_FONT_BACKEND]: If enable_font_backend is nonzero, use
722 font-backend mechanism.
723 (clear_face_cache) [USE_FONT_BACKEND]: Don't call
725 (load_face_font) [USE_FONT_BACKEND]: Abort.
726 (face_symbolic_value, face_symbolic_weight, face_symbolic_slant)
727 (face_symbolic_swidth, face_for_font) [USE_FONT_BACKEND]: New
730 * xfns.c [USE_FONT_BACKEND]: Include "font.h".
731 (x_default_font_parameter) [USE_FONT_BACKEND]: New function.
732 (Fx_create_frame) [USE_FONT_BACKEND]: If enable_font_backend is
733 nonzero, register all available font drivers. Call
734 x_default_font_parameter for deciding a font.
735 (x_create_tip_frame) [USE_FONT_BACKEND]: Likewise.
737 * xterm.c [USE_FONT_BACKEND]: Include "font.h".
738 (x_set_mouse_face_gc, x_set_glyph_string_clipping)
739 (x_set_glyph_string_clipping_exactly)
740 (x_compute_glyph_string_overhangs)
741 (x_draw_glyph_string_foreground)
742 (x_draw_composite_glyph_string_foreground, x_draw_glyph_string)
743 (x_free_frame_resources) [USE_FONT_BACKEND]: If
744 enable_font_backend is nonzero, use font-backend mechanism.
745 (x_new_fontset2) [USE_FONT_BACKEND]: New function.
747 2006-05-15 Kenichi Handa <handa@m17n.org>
749 * coding.h (system_eol_type): Fix synching with HEAD.
751 * coding.c (system_eol_type): Sync with HEAD.
752 (coding_inherit_eol_type): If PARENT is nil, inherit from
754 (syms_of_coding): Initialize system_eol_type.
756 * callproc.c (Fcall_process): Sync with HEAD.
758 * process.c (setup_process_coding_systems): Fix synching with
760 (read_process_output): Likewise.
761 (Fset_process_coding_system): Inherit system's eol format if
764 * fileio.c (choose_write_coding_system): Fix synching with HEAD.
766 * keymap.c (push_key_description): Fix synching with HEAD.
768 2006-05-02 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
770 * macgui.h (USE_ATSUI): Don't enable on emacs-unicode-2 branch.
772 2006-04-07 Kenichi Handa <handa@m17n.org>
774 * coding.c (decode_eol): Pay attention to buffer relocation in
776 (decode_coding): Call decode_eol before restoring undo_list.
778 2006-03-20 Kenichi Handa <handa@m17n.org>
780 * charset.c (Fdefine_charset_internal): Fix setting of
783 2006-03-14 Kenichi Handa <handa@m17n.org>
785 * keyboard.c (read_char): Check if C is a character or not before
786 looking up Vkeyboard_translate_table.
788 2006-03-10 Kenichi Handa <handa@m17n.org>
790 * coding.c (DECODE_EMACS_MULE_20_RELATIVE_COMPOSITION): Fix
791 condition to terminate the loop.
793 2006-03-09 Kenichi Handa <handa@m17n.org>
795 * coding.c (produce_composition): Compare charbuf[i] instead of
797 (Fterminal_coding_system): Use EQ to compare Lisp objects.
799 2006-03-07 Kenichi Handa <handa@m17n.org>
801 * coding.c (DECODE_COMPOSITION_START): If the source is short, set
802 coding->result to CODING_RESULT_INSUFFICIENT_SRC.
803 (decode_coding_gap): Set CODING_MODE_LAST_BLOCK after the call of
805 (emacs_mule_char): Handle old style (Emacs 20) component character
807 (DECODE_EMACS_MULE_COMPOSITION_RULE_20): Fix parsing a composition
809 (DECODE_EMACS_MULE_20_RULEBASE_COMPOSITION): Likewise.
810 (decode_coding_emacs_mule): Handle invalid bytes correctly.
812 2006-03-04 Kenichi Handa <handa@m17n.org>
814 * coding.c (encode_coding_ccl): Allocate destination dynamically
817 2006-03-03 Kenichi Handa <handa@m17n.org>
819 * ccl.c (Fccl_execute_on_string): Fix the condition of terminating
820 the loop. When quitted, show a proper error message.
822 2006-03-02 Kenichi Handa <handa@m17n.org>
824 * coding.c (decode_coding): Fix previous change.
826 * xterm.c (x_set_glyph_string_clipping_exactly): Set
827 src->clip_head and src->clip_tail temporarily instead of src->hl.
829 * ccl.c (CCL_WRITE_STRING): Handle a flag bit for multibyte
831 (Fccl_execute_on_string): Use ASET, not XSET.
833 2006-03-01 Kenichi Handa <handa@m17n.org>
835 * search.c (search_buffer): Fix handling of "\\" in a trivial
838 2006-02-28 Kenichi Handa <handa@m17n.org>
840 * coding.c (decode_coding): Fix the condition of terminating the
843 2006-02-27 Kenichi Handa <handa@m17n.org>
845 * data.c (Faset): On setting a character bigger than 255 in a
846 unibyte string, signal an error instead of make the string
849 2006-02-22 Kenichi Handa <handa@m17n.org>
851 * charset.c (map_charset_chars): Fix for ascii-compatible charset
852 made by a mapping table.
854 2006-02-21 Kenichi Handa <handa@m17n.org>
856 * xdisp.c (fill_composite_glyph_string): Check s->face is NULL or
858 (BUILD_COMPOSITE_GLYPH_STRING): If C is TAB, set s->face to NULL.
859 (x_produce_glyphs): If CH is TAB, set cmp->offsets properly.
861 * xterm.c (x_draw_composite_glyph_string_foreground): Check
862 s->face is NULL or not.
864 2006-02-20 Kenichi Handa <handa@m17n.org>
866 * xterm.c (x_set_glyph_string_clipping_exactly): New function.
867 (x_draw_glyph_string): Fix drawing of right_overhang and
868 left_overhang around/on cursor.
870 * xdisp.c (draw_glyphs): Fix inclusion of right_overwriting
873 * term.c (produce_glyphs): Sync to HEAD.
875 2006-02-15 Kenichi Handa <handa@m17n.org>
877 * xdisp.c (x_produce_glyphs): Handle composition with TAB.
879 2006-02-05 Kenichi Handa <handa@m17n.org>
881 * coding.c: Cancel incorrect synching with HEAD.
883 2006-02-03 Kenichi Handa <handa@m17n.org>
885 * coding.c (Fdefine_coding_system_internal): Avoid a duplicated
886 element in Vcoding_system_alist.
887 (Fdefine_coding_system_alias): Likewise.
889 2006-01-19 Kenichi Handa <handa@m17n.org>
891 * xterm.c (handle_one_xevent): Handle keysyms 0x1000000..0x10000FF.
893 * coding.c: Sync to HEAD for handling autoload-coding-system.
894 (Qcoding_system_define_form): New variable.
895 (syms_of_coding): Intern and staticpro it.
896 (Fcoding_system_p): Check Qcoding_system_define_form.
897 (Fcheck_coding_system): Try to autoload the definition of
900 * coding.h (CODING_SYSTEM_P): If ID is not available, call
902 (CHECK_CODING_SYSTEM): If ID is not available, call
903 Fcheck_coding_system.
904 (CHECK_CODING_SYSTEM_GET_SPEC): Try also Fcheck_coding_system.
905 (CHECK_CODING_SYSTEM_GET_ID): Likewise.
907 2006-01-17 Kenichi Handa <handa@m17n.org>
909 * xterm.c (handle_one_xevent): Delete unnecessary code inserted by
912 * coding.c (code_conversion_restore): GCPRO arg.
914 2005-12-28 Kenichi Handa <handa@m17n.org>
916 * character.c (lisp_string_width): Check multibyteness of STRING.
918 2005-10-18 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
920 * macterm.c (mac_encode_char): Call ccl_driver with the last arg
921 Qnil. Use JIS_TO_SJIS instead of ENCODE_SJIS.
922 (decode_mac_font_name): Use decode_coding_c_string instead of
924 (x_load_font): Initialize fontp->fontset to -1. Set
925 fontp->encoding_type.
927 2005-10-17 Kenichi Handa <handa@m17n.org>
929 * search.c (search_buffer): Give up BM search on case-fold-search
930 if one of a target character has a case-equivalence of different
931 byte length even if that target charcter is an ASCII.
932 (simple_search): Fix culculation of byte length of matched text.
933 (boyer_moore): Fix handling of case-equivalent multibyte
936 2005-10-15 Kenichi Handa <handa@m17n.org>
938 * coding.c (decode_coding): Fix handling of invalid bytes.
940 2005-10-06 Kenichi Handa <handa@m17n.org>
942 * xterm.c (handle_one_xevent): Handle keysyms directly mapped to
945 2005-09-23 Kenichi Handa <handa@m17n.org>
947 * coding.c (encode_coding_object): If a pre-write-conversion
948 function makes a new buffer, kill it.
950 2005-07-29 Kenichi Handa <handa@m17n.org>
952 * coding.c (QCascii_compatible_p): New variable.
953 (syms_of_coding): Initialize it.
954 (ONE_MORE_BYTE): Decrement `src' before calling string_char.
955 (ONE_MORE_BYTE_NO_CHECK): Likewise.
956 (record_conversion_result): Add `default:' case.
957 (coding_charset_list): Delete unused variable `coding_type'.
958 (Fdefine_coding_system_internal): Add `ascii-compatible-p'
959 property in the plist of the coding system.
960 (Fcoding_system_put): Check QCascii_compatible_p.
962 2005-06-09 Kenichi Handa <handa@m17n.org>
964 * xdisp.c (get_next_display_element): Sync with the change in
967 2005-06-06 Kenichi Handa <handa@m17n.org>
969 * callproc.c (Fcall_process): Sync with the change in
972 2005-06-05 Miles Bader <miles@gnu.org>
974 * xfaces.c (Finternal_lisp_face_equal_p): Restore previously
975 removed calculation of frame `f', as it's now used.
977 2005-05-22 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
979 * macterm.c (x_font_name_to_mac_font_name): Sync with trunk
980 for the case that does not require code conversion.
982 2005-05-11 Kenichi Handa <handa@m17n.org>
984 * Makefile.in (shortlisp): Cancel previous change.
985 (RUN_TEMACS): Include "-nl" if HAVE_SHM is defined.
986 (emacs${EXEEXT}): Run $(RUN_TEMACS) unconditionally.
987 (UNIDATA): New variable.
988 (${lispsource}international/charprop.el): Depends on ${UNIDATA}.
989 (bootstrap-emacs${EXEEXT}): Depends on charprop.el. Run
990 $(RUN_TEMACS) unconditionally.
992 2005-05-10 Kenichi Handa <handa@m17n.org>
994 * Makefile.in (shortlisp): Add ../lisp/international/charprop.el.
995 (temacs${EXEEXT}): Build charprop.el if necessary.
996 (admindir): New variable.
997 ($(lispsource)international/charprop.el): New target.
999 2005-05-04 Miles Bader <miles@gnu.org>
1001 * character.c (chars-in-region): Obsolete function removed.
1002 (syms_of_character): Remove its initialization.
1004 2005-04-28 Benjamin Riefenstahl <b.riefenstahl@turtle-trading.net>
1006 * w32select.c (validate_coding_system)
1007 (setup_windows_coding_system): New functions.
1008 (convert_to_handle_as_coded, Fw32_get_clipboard_data): Use
1009 setup_windows_coding_system.
1010 (setup_config, Fw32_get_clipboard_data): Use
1011 validate_coding_system.
1012 (Fx_selection_exists): Move call to setup_config to a place
1013 were signals are allowed.
1015 * lisp.h (Fcoding_system_base, Fcoding_system_eol_type)
1016 (Fcheck_coding_system): Add declarations.
1018 2005-04-28 Kenichi Handa <handa@m17n.org>
1020 * s/ms-w32.h (STDC_HEADERS): Sync with the change in
1023 2005-04-25 Kenichi Handa <handa@m17n.org>
1025 * charset.c (load_charset_map_from_vector): Fix for the first
1028 2005-04-22 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
1030 * macfns.c (Fx_create_frame, x_create_tip_frame): Pass Lisp
1031 string as the second argument for x_new_fontset.
1033 2005-04-18 Kenichi Handa <handa@m17n.org>
1035 * fns.c (Fstring_as_multibyte): Fix the change for syncing with
1038 2005-04-09 Kenichi Handa <handa@m17n.org>
1040 * search.c (search_buffer): Fix the change for syncing with CVS
1042 (search_buffer): Likewise.
1044 2005-03-31 Kenichi Handa <handa@m17n.org>
1046 * xdisp.c (get_next_display_element): Sync with CVS head.
1048 2005-03-29 Kenichi Handa <handa@m17n.org>
1050 * coding.c (decode_coding_object): Use safe_call1 instead of call1.
1051 (encode_coding_object): Use safe_call instead of call2.
1053 2005-03-14 Kenichi Handa <handa@m17n.org>
1055 * fontset.c (set_default_ascii_font): Fix the change for
1056 syncing with CVS head.
1058 2005-01-30 Kenichi Handa <handa@m17n.org>
1060 * fontset.c (Fset_fontset_font): Check family element of a given
1063 * Makefile.in (lisp): Include charprop.el.
1065 2005-01-17 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
1067 * macfns.c (Fx_create_frame, x_create_tip_frame): Fix crash.
1068 Not sure if it's unnecessary.
1070 2005-01-16 Steven Tamm <steventamm@mac.com>
1072 * macfns.c (Fx_create_frame, x_create_tip_frame): ifdef'd out
1073 some possibly unnecessary fontset checking code that crashed
1074 when creating a new frame
1076 2005-01-17 Kenichi Handa <handa@m17n.org>
1078 * xfaces.c (merge_faces): Fix argument to lookup_derived_face and
1081 * xdisp.c (Fformat_mode_line): Fix argument to lookup_named_face.
1083 * fringe.c (draw_fringe_bitmap_1): Fix argument to
1086 2004-12-25 Kenichi Handa <handa@m17n.org>
1088 * xdisp.c (get_next_display_element): Sync to the change in HEAD
1091 2004-12-11 Kenichi Handa <handa@m17n.org>
1093 * search.c: Sync to the change in HEAD on 2004-11-19, 20.
1095 * w32console.c: Sync to the change in HEAD on 2004-12-01.
1097 * coding.c: Cancel the change done in HEAD on 2004-11-30.
1098 (coding_charset_list): New function.
1100 * coding.h (coding_charset_list): Extern it.
1102 * term.c: Sync to the change in HEAD on 2004-11-30.
1104 2004-12-09 Kenichi Handa <handa@m17n.org>
1106 * fontset.c (Fset_fontset_font): Call find_font_encoding with
1107 concatenation of family and registry.
1109 2004-12-06 Kenichi Handa <handa@m17n.org>
1111 * character.h (BYTE8_STRING): Fix typo.
1113 * editfns.c (Ftranslate_region_internal): Don't convert unibyte
1114 string to multibyte (sync to HEAD).
1116 * casefiddle.c (casify_region): Handle changes in byte-length
1117 using replace_range_2 (sync to HEAD).
1119 2004-11-24 Andreas Schwab <schwab@suse.de>
1121 * chartab.c (map_char_table): GCPRO table and arg.
1123 2004-10-29 Kenichi Handa <handa@m17n.org>
1125 * syntax.c (skip_syntaxes): Return lispy 0 (not nil) if point is
1128 2004-10-23 Kenichi Handa <handa@m17n.org>
1130 * fontset.c (fs_load_font): Use fast_string_match_ignore_case
1131 instead of fast_c_string_match_ignore_case.
1132 (find_font_encoding): Argument changed to Lisp_Object. Use
1133 fast_string_match_ignore_case instead of
1134 fast_c_string_match_ignore_case. Caller changed.
1136 2004-10-15 Kenichi Handa <handa@m17n.org>
1138 * xdisp.c (get_next_display_element): In unibyte case, decide to
1139 display in octal form by checking a chacter by
1140 UNIBYTE_CHAR_HAS_MULTIBYTE_P.
1142 * charset.c (Fset_unibyte_charset): Setup
1143 unibyte_has_multibyte_table.
1145 * character.c (unibyte_has_multibyte_table): New variable.
1147 * character.h (unibyte_has_multibyte_table): Extern it.
1148 (UNIBYTE_CHAR_HAS_MULTIBYTE_P): New macro.
1150 2004-10-14 Kenichi Handa <handa@m17n.org>
1152 * callproc.c (Fcall_process): Fix merging of 2004-10-13 change.
1154 2004-10-13 Kenichi Handa <handa@m17n.org>
1156 * coding.c (encode_coding_iso_2022): Fix handling of charset
1159 2004-10-12 Kenichi Handa <handa@m17n.org>
1161 * coding.c (setup_coding_system): If coding_system is nil, use
1163 (Fterminal_coding_system): Return nil if terminal coding system is
1165 (syms_of_coding): Define coding-system `undecided' here. Setup
1166 terminal_coding as `undecided'.
1168 2004-10-04 Kenichi Handa <handa@m17n.org>
1170 * xdisp.c (message_dolog, set_message_1): Call
1171 unibyte_char_to_multibyte with arg type int.
1173 * fileio.c (Fsubstitute_in_file_name): Fix previous change.
1175 * lread.c (read1): Fix reading of a char-table.
1177 * print.c (print_object): Include sub char-table in cicularities
1180 2004-10-01 Kenichi Handa <handa@m17n.org>
1182 * keymap.c (where_is_internal_2): Fix for the case that KEY is a
1183 cons. Append the found sequences in car of ARGS instead of
1186 2004-09-28 Kenichi Handa <handa@m17n.org>
1188 * fileio.c (report_file_error): Make a unibyte string from
1190 (Fsubstitute_in_file_name): Fix the arg to
1191 unibyte_char_to_multibyte. It is evaluated twice.
1193 2004-09-19 Kenichi Handa <handa@m17n.org>
1195 * charset.h (CHAR_CHARSET): Shortcut for ASCII case.
1197 2004-09-14 Kenichi Handa <handa@m17n.org>
1199 * coding.c (detect_coding): Fix previous change.
1201 2004-09-13 Kenichi Handa <handa@m17n.org>
1203 * coding.c (detect_coding_utf_16): Don't set detect_info->found if
1205 (detect_coding): Optimization for ISO-2022 when no 8-bit data is
1207 (detect_coding_system): Likewise.
1209 2004-09-01 Jason Rumney <jasonr@gnu.org>
1211 * w32fns.c (x_to_w32_font): Update to use new coding struct.
1213 2004-08-17 Kenichi Handa <handa@m17n.org>
1215 * charset.c (Fdeclare_equiv_charset): Fix handing of CHARS.
1216 (Fiso_charset): Likewise.
1218 2004-08-03 Steven Tamm <steventamm@mac.com>
1220 * macterm.c (mac_encode_char): Add charset argument and update
1221 to use encoding_type
1222 (x_new_font,x_new_fontset): Merge in changes from xterm.c;
1223 switch to pure fontset
1224 (decode_mac_font_name): Temporarily remove decoding
1225 (x_font_name_to_mac_font_name): Temporarily remove encoding
1226 (x_load_font): Temporarily remove encoding
1228 2004-06-30 Kenichi Handa <handa@m17n.org>
1230 * xfaces.c (Fface_font): If frame is not on a window system,
1231 ignore CHARACTER arg. If HAVE_WINDOW_SYSTEM is not defined, don't
1232 refer to face->font.
1233 (split_font_name_into_vector, build_font_name_from_vector)
1234 (lookup_non_ascii_face, realize_non_ascii_face): Define them only
1235 whne HAVE_WINDOW_SYSTEM is defined.
1237 2004-05-29 Kenichi Handa <handa@m17n.org>
1239 * xdisp.c (BUILD_GLYPH_STRINGS): Check if s is NULL.
1240 (x_produce_glyphs): Fix setting of members of cmp in case
1241 cmp->glyph_len is zero,
1243 * fontset.c (Fset_fontset_font): Docstring fixed.
1244 (Ffontset_info): Make it backward compatible. New arg ALL.
1246 2004-05-11 Kim F. Storm <storm@cua.dk>
1248 * process.c (read_process_output): Grow decoding_buf when needed;
1249 this could cause a crash in allocate_string and compact_small_strings.
1251 2004-04-29 Kenichi Handa <handa@m17n.org>
1253 * fileio.c (WRITE_BUF_SIZE): This macro deleted.
1254 (e_write): Fix previous change.
1256 2004-04-28 Kenichi Handa <handa@m17n.org>
1258 * coding.c (setup_coding_system): Set coding->common_flags
1259 correctly for raw-text.
1260 (consume_chars): On encoding unibyte text by raw-text, don't check
1262 (encode_coding): On encoding by raw-text, never use translation
1265 * fileio.c (e_write): Short cut for the case of no encoding.
1267 2004-04-20 Kenichi Handa <handa@m17n.org>
1269 * coding.c (detect_coding): Delete unused variables.
1270 (detect_coding_system): Likewise.
1272 2004-04-18 Kenichi Handa <handa@m17n.org>
1274 * coding.c (encode_coding_utf_8): Fix handling of raw-byte char.
1275 (consume_chars): Fix handling of 8-bit bytes in unibyte source.
1277 2004-04-14 Kenichi Handa <handa@m17n.org>
1279 Sync all files to HEAD.
1281 2004-04-14 Kenichi Handa <handa@m17n.org>
1283 * coding.c (Ffind_coding_systems_region_internal): Include
1284 raw-text and no-conversion in the result.
1286 * fontset.h: Sync to HEAD.
1288 * fontset.c: Sync to HEAD.
1290 2004-04-14 Kenichi Handa <handa@m17n.org>
1292 * fontset.c (find_font_encoding): Return `ascii' for unknown
1294 (load_font_get_repertory): Delete unnecessary check of ENCODING of
1296 (font_def_arg, add_arg, from_arg, to_arg): New args.
1297 (set_fontset_font): Argument changed.
1298 (Fset_fontset_font): Fix for the case that TARGET is a script
1299 name and charset name.
1300 (new_fontset_from_font_name): Fix argument to Fnew_fontset.
1302 2004-04-13 Kenichi Handa <handa@m17n.org>
1304 * fontset.c (fontset_font): Renamed from fontset_face. Return
1306 (face_suitable_for_char_p): Adjusted for the change of
1308 (face_for_char): Likewise.
1309 (make_fontset_for_ascii_face): Fix setting of the fontset element
1311 (Finternal_char_font): Use fontset_font instead of FACE_FOR_CHAR
1313 (Ffontset_info): Adjusted for the change of fontset_font.
1315 * composite.c: Sync to HEAD.
1317 * search.c: Sync to HEAD.
1319 * coding.c: Sync to HEAD.
1320 (emacs_mule_char): Check invalid code more regidly.
1322 * coding.h: Sync to HEAD.
1324 * charset.c: Sync to HEAD.
1326 * charset.h: Sync to HEAD.
1328 * character.h (LEADING_CODE_LATIN_1_MIN)
1329 (LEADING_CODE_LATIN_1_MAX): Delete these macros.
1331 2004-04-08 Kenichi Handa <handa@m17n.org>
1333 * category.h: Sync to HEAD.
1335 * category.c: Sync to HEAD.
1337 * syntax.h: Sync to HEAD.
1339 * syntax.c: Sync to HEAD.
1341 * regex.h: Sync to HEAD.
1343 * regex.c: Sync to HEAD.
1345 2004-04-07 Kenichi Handa <handa@m17n.org>
1347 * editfns.c: Sync to HEAD.
1348 (check_translation): New function.
1349 (Ftranslate_region_internal): Handle M:N mapping.
1351 2004-04-06 Kenichi Handa <handa@m17n.org>
1353 * xfaces.c (xlfd_point_size): Set font->numeric[XLFD_PIXEL_SIZE].
1355 2004-03-30 Kenichi Handa <handa@m17n.org>
1357 * coding.c (DECODE_DESIGNATION): Set chars_96 to -1 instead of
1359 (decode_coding_iso_2022): Fix handling of invalid designation.
1361 * fileio.c (Finsert_file_contents): Be sure to call unbind_to
1362 after calling code_conversion_save.
1364 2004-03-11 Kenichi Handa <handa@m17n.org>
1366 * xdisp.c (handle_auto_composed_prop): Fix Lisp_Object/int mixup.
1368 * print.c (print_prune_string_charset): Fix Lisp_Object/int mixup.
1370 * fontset.c: Include "intervals.h".
1371 (fontset_face): Fix comparing of Lisp_Objects.
1372 (free_face_fontset): Fix Lisp_Object/int mixup.
1373 (new_fontset_from_font_name): Likewise.
1375 * editfns.c (Ftranslate_region_internal): Fix Lisp_Object/int mixup.
1377 * coding.c: Add many prototypes for static functions.
1378 (get_translation_table): Allow max_lookup to be NULL.
1379 (decode_coding): Call get_translation_table with max_lookup NULL.
1380 (Ffind_coding_systems_region_internal): Likewise.
1381 (Funencodable_char_position, Fcheck_coding_systems_region):
1384 2004-03-11 Kenichi Handa <handa@m17n.org>
1386 * coding.c (get_translation_table): Declare it as Lisp_Object.
1387 (LOOKUP_TRANSLATION_TABLE): New macro.
1388 (produce_chars): Use LOOKUP_TRANSLATION_TABLE instead of
1390 (consume_chars): Likewise.
1392 2004-03-11 Kenichi Handa <handa@m17n.org>
1394 * coding.c (MAX_ANNOTATION_LENGTH): Adjusted for the change of
1395 annotation data format.
1396 (ADD_ANNOTATION_DATA, ADD_COMPOSITION_DATA, ADD_CHARSET_DATA):
1397 Change arguments FROM and TO to single argument NCHARS. Caller
1399 (decode_coding_utf_8): Pay attention to coding->charbuf_used.
1400 (decode_coding_utf_16, decode_coding_emacs_mule)
1401 (decode_coding_iso_2022, decode_coding_sjis, decode_coding_big5)
1402 (decode_coding_ccl, decode_coding_charset): Likewise.
1403 (get_translation): New function.
1404 (produce_chars): New arguments translation_table and last_block.
1405 Translate characters here. Return number of carryover chars.
1407 (produce_composition): New argument pos. Caller changed.
1408 Adjusted for the change of annotation data format.
1409 (produce_charset, produce_annotation): Likewise.
1410 (decode_coding, encode_coding): Don't call translate_chars.
1411 (consume_chars): New arg translation_table. Caller changed.
1412 (translate_chars): Deleted.
1413 (syms_of_coding): Make translation-table's number of extra slots
1416 2004-03-09 Kenichi Handa <handa@m17n.org>
1418 * search.c (simple_search): Fix setting this_pos_byte in backward
1421 * coding.c (detect_coding_emacs_mule): Fix counting of encoded
1423 (detect_coding_ccl): Fix setting of the variable valids.
1425 2004-03-04 Kenichi Handa <handa@m17n.org>
1427 * xterm.c (x_list_fonts): Fix the detection of an auto-scaled font.
1429 * coding.c (decode_coding_utf_16): Fix handling of surrogate pair.
1431 * editfns.c (Ftranslate_region_internal): Renamed from
1432 Ftranslate_region. Accept a char-table in TABLE.
1433 (syms_of_editfns): Defsubr Stranslate_region_internal.
1435 * xfaces.c (set_lface_from_font_name): If a font is specified for
1436 a frame, generate a fontset from the font.
1437 (build_scalable_font_name): If the scalable font is requested for
1438 a specific size, don't change that size.
1439 (try_font_list): Try a scalable font also in the case that a
1440 pattern string is specified,
1443 2004-03-03 Kenichi Handa <handa@m17n.org>
1445 * xfaces.c (Fface_font): New optional arg CHARACTER.
1447 2004-02-17 Kenichi Handa <handa@m17n.org>
1449 * charset.h (CHARSET_OFFSET): New macro.
1451 2004-02-13 Kenichi Handa <handa@m17n.org>
1453 * xterm.c (x_get_font_repertory): Fix for non-Unicode-bmp charset.
1455 * fontset.c (fontset_face): Handle the case that repertory is a
1457 (find_font_encoding): Return nil for unknown encoding.
1458 (Fset_fontset_font): Ignore a font of unknown encoding.
1460 2004-02-09 Kenichi Handa <handa@m17n.org>
1462 * keymap.c (describe_vector): Handle default value of a char
1465 * fontset.c (fontset_face): Handle fallback fonts correctly.
1466 (Ffontset_info): Return infomation about fallback fonts.
1468 2004-02-06 Kenichi Handa <handa@m17n.org>
1470 * fontset.c (FONTSET_DEFAULT): New macro.
1471 (FONTSET_ADD): Handle the case that range is nil.
1472 (fontset_add): Likewise.
1473 (Fset_fontset_font): Change the 2nd arg name to TARGET, and handle
1474 the case that it is nil.
1475 (dump_fontset): Call FONTSET_DEFAULT, not FONTSET_FALLBACK.
1476 (syms_of_fontset): Set char-table-extra-slots property of fontset
1479 * charset.h (CHAR_CHARSET_P): Fix for the case that the method is
1482 2004-01-30 Kenichi Handa <handa@m17n.org>
1484 * emacs.c (main): Call init_charset after syms_of_XXX.
1486 * charset.c (Vcharset_map_directory): Deleted.
1487 (Vcharset_map_path): New variable
1488 (load_charset_map_from_file): Use Vcharset_map_path instead.
1489 (init_charset): Initialize Vcharset_map_path.
1490 (syms_of_charset): Delete declaration of "charset-map-directory",
1491 add declaration of "charset-map-path".
1493 2004-01-29 Kenichi Handa <handa@m17n.org>
1495 * fns.c (string_char_to_byte): Optimize for ASCII only string.
1496 (string_byte_to_char): Likewise.
1498 * fileio.c (Finsert_file_contents): Avoid detecting a code twice.
1500 * coding.c (detect_coding_iso_2022): Fix handling of SS2 and SS3.
1501 (detect_coding): Treat '\0' as normal ASCII byte..
1502 (detect_coding_system): Likewise.
1504 2004-01-27 Kenichi Handa <handa@m17n.org>
1506 * coding.h (SJIS_TO_JIS2, JIS_TO_SJIS2): New macros.
1508 * coding.c (QCmnemonic, QCdefalut_char)
1509 (QCdecode_translation_table, QCencode_translation_table)
1510 (QCpost_read_conversion, QCpre_write_conversion): New variables.
1511 (get_translation_table): Return a list of translation tables if
1513 (decode_coding): Call get_translation_table with ENCODEP 0.
1514 (char_encodable_p): If translation_table is non-nil, always call
1516 (Fdefine_coding_system_internal): Accept list of translation
1517 tables as :encode-translation-table and :decode-translation-table.
1518 (Fcoding_system_put): New function.
1519 (syms_of_coding): Declare new symbols. Defsubr
1521 (decode_coding_sjis): Handle 4th charset (typically JISX0212).
1522 (encode_coding_sjis): Likewise.
1524 * charset.c (map_charset_chars): Fix arg to map_charset_chars in
1525 when the charset is superset type.
1527 * character.c (translate_char): Accept list of translation tables.
1529 2004-01-25 Kenichi Handa <handa@m17n.org>
1531 * coding.h (enum coding_attr_index): New member
1532 coding_attr_trans_tbl.
1533 (CODING_ATTR_TRANS_TBL): New macro.
1535 * coding.c (get_translation_table): New function.
1536 (translate_chars): Fix the bug of skipping annotation data.
1537 (decode_coding): Utilze get_translation_table.
1538 (encode_coding): Likewise.
1539 (char_encodable_p): Translate char if necessary.
1540 (Funencodable_char_position): Likewise.
1541 (Ffind_coding_systems_region_internal): Setup translation table
1542 for encode in a coding system attribute vector in advance.
1543 (Fcheck_coding_systems_region): Likewise.
1544 (Fdefine_coding_system_internal): Allow a symbol as translation
1545 table. For shift-jis type coding system, allow 4th charset.
1547 2004-01-24 Kenichi Handa <handa@m17n.org>
1549 * coding.c (decode_coding_sjis): Check the first byte rigidly.
1551 * xdisp.c (get_next_display_element): Pass -1 as POS to
1552 FACE_FOR_CHAR if displaying a C-string.
1554 2004-01-23 Kenichi Handa <handa@m17n.org>
1556 * composite.c (get_composition_id): Handle xoff and yoff in a
1559 * composite.h (COMPOSITION_DECODE_RULE): New arg xoff and yoff.
1560 (struct composition): New member lbearing and rbearing.
1562 * xdisp.c (move_it_to): Optimize for the case (op & MOVE_TO_Y).
1563 (x_get_glyph_overhangs): Handle a composition glyph.
1564 (x_produce_glyphs): Setup lbearing and rbreaing for a composition
1567 * xterm.c (x_compute_glyph_string_overhangs): Handle also a
1570 2004-01-18 Kenichi Handa <handa@m17n.org>
1572 * print.c: Include charset.h.
1573 (Vprint_charset_text_property): New variable.
1574 (Qdefault): Extern it.
1575 (PRINT_STRING_NON_CHARSET_FOUND)
1576 (PRINT_STRING_UNSAFE_CHARSET_FOUND): New macros.
1577 (print_check_string_result): New variable.
1578 (print_check_string_charset_prop): New function.
1579 (print_prune_charset_plist): New variable.
1580 (print_prune_string_charset): New function.
1581 (print_object): Call print_prune_string_charset if
1582 Vprint_charset_text_property is not t.
1583 (print_interval): Print nothing if itnerval->plist is nil.
1584 (syms_of_print): Declare Vprint_charset_text_property as a lisp
1585 variable. Init and staticpro print_prune_charset_plist.
1587 2004-01-15 Kenichi Handa <handa@m17n.org>
1589 * fontset.c (new_fontset_from_font_name): Use the specified font
1590 for all characters in the new fontset.
1592 * macterm.c (x_set_mouse_face_gc): Call FACE_FOR_CHAR with POS and
1595 * xdisp.c (x_produce_glyphs): Call FACE_FOR_CHAR with POS and
1596 OBJECT args for composition too.
1598 * w32term.c (x_set_mouse_face_gc): Call FACE_FOR_CHAR with POS and
1601 2004-01-13 Kenichi Handa <handa@m17n.org>
1603 * dispextern.h (FACE_FOR_CHAR): New args POS and OBJECT.
1605 * fontset.c (reorder_font_vector): Adjusted for the change of
1607 (fontset_face): New arg id. Caller changed.
1608 (face_for_char): New args pos and object.
1609 (make_fontset_for_ascii_face): Adjusted for the change of FONT_DEF
1611 (fs_query_fontset): Check NAME by Fassoc too.
1612 (Fset_fontset_font): Allow non-XLFD font name.
1613 (Ffontset_info): Adjusted for the change of FONT_DEF format.
1615 * fontset.h (face_for_char): Prototype adjusted.
1617 * xdisp.c (face_before_or_after_it_pos): Call FACE_FOR_CHAR with
1618 POS and OBJECT args.
1619 (get_next_display_element): Likewise.
1620 (append_space): Likewise.
1621 (extend_face_to_end_of_line): Likewise.
1622 (get_char_face_and_encoding): Likewise.
1623 (BUILD_COMPOSITE_GLYPH_STRING): Likewise.
1624 (x_produce_glyphs): Likewise.
1626 * xfaces.c (compute_char_face): Call FACE_FOR_CHAR with
1627 POS and OBJECT args.
1629 * xterm.c (x_set_mouse_face_gc): Call FACE_FOR_CHAR with
1630 POS and OBJECT args.
1632 2004-01-03 Jason Rumney <jasonr@gnu.org>
1634 * w32select.c (Fw32_set_clipboard_data): Avoid potential realloc
1635 of GlobalAlloc'ed memory.
1637 2003-12-29 Kenichi Handa <handa@m17n.org>
1639 * ccl.c (Fccl_execute_on_string): Fix the condition of loop.
1641 * charset.h (charset_table_used): Delete extern.
1643 * charset.c (charset_table_used): Make it static.
1644 (map_charset_chars): Fix args to c_function with.
1646 * chartab.c (map_sub_char_table_for_charset): Fix args to
1649 * coding.h (enum coding_result_code): Delete
1650 CODING_RESULT_INSUFFICIENT_CMP, add CODING_RESULT_INVALID_SRC.
1652 * coding.c (Qinsufficient_source, Qinconsistent_eol)
1653 (Qinvalid_source, Qinterrupted, Qinsufficient_memory): New
1655 (Vlast_code_conversion_error): New variables.
1656 (syms_of_coding): DEFSYM or DEFVAR_LISP them.
1657 (ONE_MORE_BYTE): Record error if any instead of signaling an
1658 error. If non-ASCII multibyte char is found, return the negative
1659 value of the code. All callers changed to check it.
1660 (ONE_MORE_BYTE_NO_CHECK): Likewise.
1661 (record_conversion_result): New function. All codes setting
1662 coding->result are changed to call this function.
1663 (detect_coding_utf_8): Don't use the local variable incomplete.
1664 (decode_coding_utf_8): Likewise.
1665 (emacs_mule_char): Change the second arg to `const'.
1666 (detect_coding_emacs_mule): Don't use the local variable
1668 (detect_coding_sjis): Likewise.
1669 (detect_coding_big5): Likewise.
1670 (decode_coding): Fix of flushing out unprocessed data.
1671 (make_conversion_work_buffer): Fix making of a work buffer.
1672 (decode_coding_object): Return coding->dst_object;
1674 * fontset.c (set_fontset_font): Fix args.
1676 * lisp.h (CHARACTERBITS): Define as 22.
1678 * process.c (send_process): Be sure to set coding->src_multibyte.
1680 * xdisp.c (handle_auto_composed_prop): Fix setting of limit.
1682 2003-12-02 Kenichi Handa <handa@m17n.org>
1684 * xdisp.c (handle_auto_composed_prop): Give limit to
1685 Fnext_single_char_property_change.
1687 2003-12-02 Kenichi Handa <handa@m17n.org>
1689 * coding.c (detect_coding): Fix previous change.
1690 (detect_coding_system): Likewise.
1692 2003-12-02 Kenichi Handa <handa@m17n.org>
1694 * composite.c (syms_of_composite): Don't make the compostion hash
1697 * fontset.c (Fset_fontset_font): Fix docstring.
1699 * lisp.h (detect_coding_system): Adjust prototype.
1701 * fileio.c (kill_workbuf_unwind): Delete this function.
1702 (Finsert_file_contents): Adjust the call of detect_coding_system.
1703 Get conversion_buffer by code_conversion_save. Use the macor
1704 CODING_MAY_REQUIRE_DECODING. After decoding, update
1707 * coding.h (make_conversion_work_buffer): Delete extern.
1708 (code_conversion_save): Extern it.
1710 * coding.c (enum iso_code_class_type): Delete ISO_carriage_return.
1711 (CODING_GET_INFO): Delete argument eol_type. Callers changed.
1712 (decode_coding_utf_8): Don't do eol converion.
1713 (detect_coding_utf_16): Check coding->src_chars, not
1714 coding->src_bytes. Add heuristics for those that have no
1716 (decode_coding_emacs_mule): Don't do eol converion.
1717 (decode_coding_iso_2022): Likewise.
1718 (decode_coding_sjis): Likewise.
1719 (decode_coding_big5): Likewise.
1720 (decode_coding_charset): Likewise.
1721 (adjust_coding_eol_type): Return a new coding system.
1722 (detect_coding): Don't detect eol. Fix for utf-16 detection.
1723 (decode_eol): In case of CRLF->LF conversion, use del_range_2 on
1725 (decode_coding): Pay attention to undo_list. Do eol convesion for
1726 all types of coding-systems (if necessary).
1727 (Vcode_conversion_work_buf_list): Delete it.
1728 (Vcode_conversion_reused_workbuf): Renamed from
1729 Vcode_conversion_reused_work_buf.
1730 (Vcode_conversion_workbuf_name): New variable.
1731 (reused_workbuf_in_use): New variable.
1732 (make_conversion_work_buffer): Delete the arg DEPTH.
1733 (code_conversion_restore): Argument changed to cons.
1734 (code_conversion_save): Delete the argument BUFFER. Callers
1736 (detect_coding_system): New argument src_chars. Callers changed.
1737 Fix for utf-16 detection.
1738 (init_coding_once): Don't use ISO_carriage_return.
1739 (syms_of_coding): Initialized Vcode_conversion_workbuf_name and
1740 reused_workbuf_in_use.
1742 2003-11-24 Kenichi Handa <handa@m17n.org>
1744 * keymap.c (store_in_keymap): Pay attention to the case that idx
1745 is a cons specifying a character range.
1747 * coding.c (Fdefine_coding_system_internal): Fix previous change.
1749 2003-11-23 Kenichi Handa <handa@m17n.org>
1751 * xdisp.c (handle_auto_composed_prop): Fix the case of returning
1752 HANDLED_RECOMPUTE_PROPS.
1754 * coding.c (Fdefine_coding_system_internal): Fix checking of
1755 ascii compatibility.
1757 2003-11-22 Kenichi Handa <handa@m17n.org>
1759 * charset.c (find_charsets_in_text): Delete unused locale
1761 (Fset_charset_priority): Update Vemacs_mule_charset_list too.
1763 * coding.c (encode_coding_emacs_mule): Emit bytes with MSB.
1764 Resync charset_list to Vemacs_mule_charset_list.
1766 * keymap.c (store_in_keymap): Pay attention to the case that idx
1767 is a cons specifying a character range.
1769 2003-11-18 Kenichi Handa <handa@m17n.org>
1771 * composite.c (update_compositions): Bind inhibit-read-only, etc
1772 to t before calling remove-list-of-text-properties.
1774 * print.c (print_object): Always print ASCII chars as is.
1776 2003-11-17 Kenichi Handa <handa@m17n.org>
1778 * keymap.c (Fdefine_key): Fix handling of Lucid style event type
1781 * fns.c (Fmapconcat): Signal an error if SEQUENCE is a char table.
1782 (Fmapcar): Likewise.
1785 2003-11-15 Kenichi Handa <handa@m17n.org>
1787 * syntax.c (skip_chars): Be sure to alloca char_ranges when
1790 2003-11-14 Kenichi Handa <handa@m17n.org>
1792 * xfaces.c (set_lface_from_font_name): Fix for the case that
1793 FONTNAME is not fontset name.
1795 2003-11-13 Kenichi Handa <handa@m17n.org>
1797 * fns.c (base64_encode_1): Fix previous change.
1799 2003-11-08 Kenichi Handa <handa@m17n.org>
1801 * fontset.c (set_fontset_font): New function.
1802 (Fset_fontset_font): If a font is specified for a charset, use
1803 map_charset_chars to store the font spec in a fontset.
1805 2003-10-29 Kenichi Handa <handa@m17n.org>
1807 * fontset.c (fontset_face): Create a fallback fontset on demand
1808 (make_fontset): Don't create a fallback fontset here.
1809 (free_face_fontset): Free a fallback fontset (if any) too.
1810 (n_auto_fontsets): Delete this variable.
1811 (auto_fontset_alist): New variable.
1812 (new_fontset_from_font_name): Check auto_fontset_alist.
1813 (dump_fontset) [FONTSET_DEBUG]: Fully re-written.
1814 (Ffontset_list_all) [FONTSET_DEBUG]: New function.
1815 (syms_of_fontset): Initialize and staticpro auto_fontset_alist.
1816 Defsubr Sfontset_list_all.
1818 2003-10-24 Kenichi Handa <handa@m17n.org>
1820 * xterm.c (x_list_fonts): Fix excluding of auto-scaled fonts.
1822 2003-10-23 Kenichi Handa <handa@m17n.org>
1824 * fontset.c (Fnew_fontset): Check NAME more rigidly.
1826 2003-10-17 Kenichi Handa <handa@m17n.org>
1828 * editfns.c (Fgoto_char): Fix docstring.
1830 2003-10-16 Kenichi Handa <handa@m17n.org>
1832 * insdel.c (insert_from_gap): Adjust intervals correctly.
1834 2003-10-12 Jason Rumney <jasonr@gnu.org>
1836 * w32term.c (GLYPHSET, WCRANGE): Define if system headers don't.
1837 (pfnGetFontUnicodeRanges): New dynamically loaded function.
1838 (w32_initialize): Try to load it.
1839 (x_get_font_repertory): Use it if available.
1840 (w32_encode_char): Add shortcut for unicode output.
1842 * w32fns.c (w32_load_system_font): Default charset to -1.
1843 (x_to_w32_charset): Match all fonts for unicode.
1844 (w32_to_x_charset): New parameter matching. Don't return partial
1845 or wildcard charsets.
1846 (w32_to_all_x_charsets): Don't return partial or wildcard charsets.
1847 (w32_codepage_for_font): Return CP_UNICODE for unicode.
1848 (w32_to_x_font): Match charset to real charset.
1849 (enum_font_cb2): Always list unicode versions.
1851 * makefile.w32-in (temacs): Increase EMHEAP.
1853 2003-10-11 Jason Rumney <jasonr@gnu.org>
1855 * w32term.c (w32_encode_char): New charset parameter.
1856 font_info.encoding becomes encoding_type.
1857 (x_get_font_repertory): New function. Warning: stub only!
1858 (x_new_font): Return quickly if font already set.
1859 (x_new_fontset): fontsetname parameter is Lisp_Object.
1860 Use new fs_query_fontset. Try new_fontset_from_font_name. Use
1861 fontset_name for return value.
1863 * w32term.h: Declare x_get_font_repertory.
1865 * w32select.c (Fw32_set_clipboard_data): Use string_x_string_p in
1866 place of find_charset_in_text. Use encode_coding_object in place
1868 (Fw32_get_clipboard_data): Use decode_coding_c_string in place of
1871 * w32fns.c (Fx_create_frame, x_create_tip_frame): Use new version
1873 (w32_load_system_font): Initialize charset as unicode.
1874 font_info.encoding becomes encoding_type.
1875 (w32_to_x_font): Use decode_coding_c_string in place of
1877 (x_to_w32_font): Use encode_coding_object in place of
1879 (syms_of_w32fns): Set get_font_repertory_func.
1881 * w32console.c: Include character.h. Use terminal_encode_buffer
1883 (write_glyphs): Use new version of encode_terminal_code. Use
1884 encode_coding_object in place of encode_coding.
1886 * w32bdf.c (w32_load_bdf_font): Clear font_info before filling.
1887 encoding becomes encoding_type.
1889 * term.c (terminal_encode_buffer): Make externally visible.
1891 * makefile.w32-in: Add character.h dependancies.
1892 (character.o, chartab.o): New targets.
1894 2003-10-10 Kenichi Handa <handa@m17n.org>
1896 * fileio.c (Finsert_file_contents) [DOS_NT]: Use the macro
1897 CODING_ID_EOL_TYPE..
1899 2003-10-07 Andreas Schwab <schwab@suse.de>
1901 * coding.c (produce_chars): Revert last change.
1903 2003-10-06 Kenichi Handa <handa@m17n.org>
1905 * charset.h (charset_unicode): Extern it.
1907 * charset.c (string_xstring_p): Check by (C >= 0x100).
1908 (find_charsets_in_text): Format of the arc CHARSETS changed. New
1910 (Ffind_charset_region, Ffind_charset_string): Adjusted for the
1911 change of find_charsets_in_text.
1912 (Fsplit_char): Fix doc. Never return unknown.
1914 * chartab.c (char_table_translate): Use CHARACTERP, not INETEGERP.
1916 * coding.c (Fdefine_coding_system_alias): Update
1917 Vcoding_system_list.
1919 * fontset.c (load_font_get_repertory): Pay attention to the case
1920 that ENCODING of a font is specified by a char-table.
1922 * xterm.c (x_get_font_repertory): Handle the case that the
1923 encoding of font is other than Unicode.
1925 2003-10-02 Kenichi Handa <handa@m17n.org>
1927 * term.c (encode_terminal_code): Don't handle glyph-table. Check
1928 if a character is encodable by the terminal coding system. If
1929 not, produces proper number of `?'s. Update
1930 terminal_encode_buffer and terminal_encode_buf_size if necessary.
1931 (produce_glyphs): Check by CHAR_BYTE8_P, not SINGLE_BYTE_CHAR_P.
1933 2003-10-01 Kenichi Handa <handa@m17n.org>
1935 * term.c (terminal_encode_buffer, terminal_encode_buf_size): New
1937 (encode_terminal_code): Argument changed. Encode multiple
1938 characters at once. Store the result of encoding in
1939 terminal_encode_buffer.
1940 (write_glyphs): Adjusted for the change of encode_terminal_code.
1941 (insert_glyphs): Likewise.
1942 (term_init): Initialize terminal_encode_buffer and
1943 terminal_encode_buf_size.
1945 * coding.c (consume_chars): If coding->src_object is nil, don't
1948 2003-09-30 Kenichi Handa <handa@m17n.org>
1950 * character.c (char_string): Use ASCII_CHAR_P instead of
1953 2003-09-30 Kenichi Handa <handa@m17n.org>
1955 * xdisp.c (handle_auto_composed_prop): Check if the last
1956 characters of auto-composed region is newly composed with the
1957 following characters.
1958 (handle_composition_prop): Fix checking of point being inside
1961 2003-09-26 Kenichi Handa <handa@m17n.org>
1963 * fns.c (concat): Don't change multibyteness of the result by
1964 concatenating an 8-bit character.
1966 * data.c (Faset): Check newelt by CHECK_CHARACTER. Don't change
1967 multibyteness of the result when newelt is an 8-bit character.
1969 2003-09-29 Dave Love <fx@gnu.org>
1971 * xmenu.c (find_and_call_menu_selection): Make menu_bar_items_used
1974 * xfns.c (DefaultDepthOfScreen, x_encode_text): Remove unused vars.
1976 * xfaces.c (face_numeric_value): Declare dim size_t.
1977 (Finternal_lisp_face_equal_p): Remove unused f.
1979 * xdisp.c (BUILD_CHAR_GLYPH_STRINGS, display_and_set_cursor)
1980 (MATRIX_ROW): Remove unused vars.
1981 (draw_glyphs, x_insert_glyphs, fast_find_position)
1982 (fast_find_position, fast_find_string_pos): Use EMACS_INT for
1985 * regex.c (regex_compile): Remove unused var.
1987 * minibuf.c (Fminibuffer_complete_word): Remove unused var.
1989 * keymap.c (Fset_keymap_parent, map_keymap, Fcopy_keymap)
1990 (Faccessible_keymaps, where_is_internal): Remove unused vars.
1992 * keyboard.c (cancel_hourglass_unwind): Return Qnil.
1994 * frame.c (frame_name_fnn_p): Make len EMACS_INT.
1996 * fileio.c (Fwrite_region): Remove unused var.
1998 * dispnew.c (adjust_frame_glyphs_for_frame_redisplay)
1999 (adjust_frame_glyphs_for_window_redisplay): Remove unused ch_dim.
2001 * composite.c (Fremove_list_of_text_properties): Declare.
2003 * coding.c (inhibit_pre_post_conversion): Removed (unused).
2004 (alloc_destination, produce_chars): Use EMACS_INT for byte/char
2006 (coding_inherit_eol_type): Remove unused attrs.
2007 (detect_coding): Cast arg of detect_eol.
2009 * charset.c (syms_of_charset): Remove unused var p.
2010 (find_charsets_in_text, Ffind_charset_region): Use EMACS_INT for
2013 * casetab.c (set_case_table): Remove unused var.
2015 * window.c (Fdisplay_buffer, Fframe_selected_window): Remove
2018 2003-09-26 Dave Love <fx@gnu.org>
2020 * xterm.c (x_bitmap_mask): Declare.
2022 2003-09-17 Dave Love <fx@gnu.org>
2024 * xterm.c (x_term_init): Fix type error.
2026 * lisp.h: Add Funibyte_char_to_multibyte.
2028 * coding.c (Fread_coding_system): Fix arg of XSETSTRING.
2029 (Fset_coding_system_priority): Doc fix.
2031 * alloc.c: Sync with HEAD version.
2033 * ccl.c (ccl_driver): Fix arg of CHARACTERP.
2035 * indent.c (check_composition): Make start and end EMACS_INT.
2037 * character.c (lisp_string_width): Make ignore and end EMACS_INT.
2039 * xdisp.c (handle_composition_prop, check_point_in_composition):
2040 Make buffer positions EMACS_INT.
2042 * composite.c (find_composition, run_composition_function)
2043 (update_compositions, Ffind_composition_internal): Make buffer
2044 positions EMACS_INT.
2046 * composite.h (find_composition, update_compositions): Make
2047 position args EMACS_INT.
2049 * keyboard.c (adjust_point_for_property): Make beg and end
2052 * intervals.c (get_property_and_range)
2053 * intervals.h (get_property_and_range): Make start and end EMACS_INT.
2055 * unexalpha.c: Don't include varargs.h.
2057 2003-09-16 Dave Love <fx@gnu.org>
2059 * coding.h (ENCODE_UTF_8): New.
2061 * Makefile.in (gtkutil.o): Depend on coding.h.
2063 * coding.c (Fset_coding_system_priority): Doc fix.
2065 2003-09-16 Kenichi Handa <handa@m17n.org>
2067 * fileio.c (Finsert_file_contents): Call setup_coding_system in
2068 the case of auto saving.
2070 2003-09-10 Andreas Schwab <schwab@suse.de>
2072 * chartab.c (map_char_table): Protect `range' from GC.
2073 (map_char_table_for_charset): Likewise.
2075 2003-07-09 Kenichi Handa <handa@m17n.org>
2077 * coding.c (decode_coding_sjis): Check bytes more rigidly.
2079 2003-06-26 Kenichi Handa <handa@m17n.org>
2081 * fileio.c (choose_write_coding_system): Return a decided coding
2083 (Fwrite_region): Set Vlast_coding_system_used to the return value
2084 of choose_write_coding_system.
2086 2003-06-06 Kenichi Handa <handa@m17n.org>
2088 * charset.c (Fset_charset_priority): Pay attention to duplicated
2091 * coding.c (QCcategory): New variable.
2092 (syms_of_coding): Defsym it. Set all elements of
2093 Vcoding_category_table and their symbol values.
2094 (Fset_coding_system_priority): Doc fix. Update symbol qvalues of
2095 coding-category-XXX, and coding-category-list.
2096 (Fdefine_coding_system_internal): Add category in the plist.
2098 2003-06-05 Kenichi Handa <handa@m17n.org>
2100 * callproc.c (Fcall_process): Handle carryover correctly.
2102 * coding.c (decode_coding_iso_2022): Fix handling of invalid
2104 (raw_text_coding_system): Check NILP (coding_system).
2105 (coding_inherit_eol_type): Check NILP (coding_system) and
2107 (consume_chars): Fix for the case of raw-text.
2109 * process.c (read_process_output): Handle carryover correctly.
2111 2003-06-02 Dave Love <fx@gnu.org>
2113 * regex.c (re_search_2): Fix last change.
2115 2003-05-30 Kenichi Handa <handa@m17n.org>
2117 * regex.c (GET_CHAR_BEFORE_2): Check multibyte, not
2118 target_multibyte. Even in a unibyte case, return a converted
2120 (GET_CHAR_AFTER): New macro.
2121 (PATFETCH): Translate via multibyte char.
2122 (HANDLE_UNIBYTE_RANGE): Delete this macro.
2123 (SETUP_MULTIBYTE_RANGE): New macro.
2124 (regex_compile): Setup compiled code so that its multibyteness
2125 matches that of a target. Fix the handling of "[X-YZ]" using
2126 SETUP_MULTIBYTE_RANGE.
2127 (analyse_first) <charset>: For filling fastmap for all multibyte
2128 characters, don't check by BASE_LEADING_CODE_P.
2129 (re_search_2): Don't check RE_TARGET_MULTIBYTE_P (bufp). It is
2130 the same as RE_MULTIBYTE_P (bufp) now.
2131 (mutually_exclusive_p): Check by (! multibyte ||
2133 (TARGET_CHAR_AND_LENGTH): Delete this macro.
2134 (TRANSLATE_VIA_MULTIBYTE): New macro.
2135 (re_match_2_internal): Don't check RE_TARGET_MULTIBYTE_P (bufp).
2136 It is the same as RE_MULTIBYTE_P (bufp) now.
2137 <exactn>: Translate via multibyte.
2138 <anychar>: Fetch a character by RE_STRING_CHAR_AND_LENGTH. Don't
2140 <charset, charset_not>: Fetch a character by
2141 RE_STRING_CHAR_AND_LENGTH. Translate via multibyte.
2142 <duplicate>: Call bcmp_translate with the last arg `multibyte'.
2143 <wordbound, notwordbound, wordbeg, wordend, syntaxspec,
2144 notsyntaxspec, categoryspec, notcategoryspec> Fetch a character
2146 (bcmp_translate): Likewise.
2148 * search.c (compile_pattern): Check the member target_multibyte,
2149 not the member multibyte of buf.
2151 * lread.c (read1): While reading a string, set force_singlebyte
2152 and force_multibyte correctly.
2154 * charset.c (Fset_unibyte_charset): Fix setting up of
2155 unibyte_to_multibyte_table.
2156 (init_charset_once): Likewise.
2158 2003-05-29 Kenichi Handa <handa@m17n.org>
2160 * coding.c (setup_coding_system): If coding has
2161 post-read-conversion or pre-write-conversion, set
2162 CODING_REQUIRE_DECODING_MASK and CODING_REQUIRE_ENCODING_MASK
2164 (decode_coding_gap): Run post-read-conversion if any.
2166 * fileio.c (Finsert_file_contents): Even if we read into a
2167 unibyte buffer, check if we must decode the result or not.
2169 2003-05-29 Kenichi Handa <handa@m17n.org>
2171 * coding.c (make_conversion_work_buffer): Change the work buffer
2172 name to the same one as that of Emacs 21.
2174 2003-05-28 Kenichi Handa <handa@m17n.org>
2176 * coding.h (make_conversion_work_buffer): Prototype adjusted.
2177 (code_conversion_restore): Don't extern it.
2179 * coding.c (detected_mask): Delete unused variable.
2180 (decode_coding_iso_2022): Pay attention to the byte sequence of
2181 CTEXT extended segment, and retain those bytes as is.
2182 (decode_coding_ccl): Delete unused variable `valids'.
2183 (setup_coding_system): Delete unused variable `category'.
2184 (consume_chars): Delete unused variable `category'. Make it work
2185 for non-multibyte case.
2186 (make_conversion_work_buffer): Argument changed.
2187 (saved_coding): Delete unused variable.
2188 (code_conversion_restore): Don't check saved_coding->destination.
2189 (code_conversion_save): New function.
2190 (decode_coding_gap, encode_coding_gap): Call code_conversion_save
2191 instead of record_unwind_protect.
2192 (decode_coding_object, encode_coding_object): Likewise. Recover
2194 (detect_coding_system): Delete unused variable `mask'.
2195 (Fdefine_coding_system_internal): Delete unsed vaiable id;
2197 * fileio.c (kill_workbuf_unwind): New function.
2198 (Finsert_file_contents): On replacing, call
2199 make_conversion_work_buffer with correct args, and call
2200 record_unwind_protect with the first arg kill_workbuf_unwind.
2202 * lisp.h (Fgenerate_new_buffer_name): EXFUN it.
2204 2003-05-20 Kenichi Handa <handa@m17n.org>
2206 * fontset.c (BASE_FONTSET_P): Check FONTSET_BASE, not
2208 (fontset_add): Fix for the case that TO is less than TO1.
2209 (Ffontset_info): Don't use fallback fontset on checking the
2211 (dump_fontset): New function for debugging.
2213 * coding.c (Fdefine_coding_system_internal): Fix for the case that
2214 coding_type is Qcharset.
2216 2003-05-07 Kenichi Handa <handa@m17n.org>
2218 * chartab.c (map_sub_char_table): New argument DEFAULT_VAL.
2219 (map_char_table): Don't inherit the value from the parent on
2220 initializing VAL. Adjusted for the above change.
2222 2003-05-06 Kenichi Handa <handa@m17n.org>
2224 * coding.c (Qsignature, Qendian): Delete these variables.
2225 (syms_of_coding): Don't initialize them.
2226 (CATEGORY_MASK_UTF_16_AUTO): New macro.
2227 (detect_coding_utf_16): Add CATEGORY_MASK_UTF_16_AUTO in
2229 (decode_coding_utf_16): Don't detect BOM here.
2230 (encode_coding_utf_16): Produce BOM if CODING_UTF_16_BOM (coding)
2231 is NOT utf_16_without_bom.
2232 (setup_coding_system): For a coding system of type utf-16, check
2233 if the attribute :endian is Qbig or not (not nil or not), and set
2234 CODING_REQUIRE_DETECTION_MASK if BOM detection is required.
2235 (detect_coding): If coding type is utf-16 and BOM detection is
2236 required, detect it.
2237 (Fdefine_coding_system_internal): For a coding system of type
2238 utf-16, check if the attribute :endian is Qbig or not (not nil or
2241 2003-05-06 Kenichi Handa <handa@m17n.org>
2243 * coding.c (coding_set_source): Fix for the case that the current
2244 buffer is different from coding->src_object.
2245 (decode_coding_object): Don't use the conversion work buffer if
2246 DST_OBJECT is a buffer.
2248 2003-05-04 Dave Love <fx@gnu.org>
2250 * lread.c (read_emacs_mule_char) [len==2]: Index
2251 emacs_mule_charset correctly.
2253 2003-02-16 Dave Love <fx@gnu.org>
2255 * coding.c (Qbig5, Vbig5_coding_system, CATEGORY_MASK_BIG5)
2256 (detect_coding_big5, decode_coding_big5, encode_coding_big5)
2257 (Fdecode_big5_char, Fencode_big5_char): Deleted. (Big5 no longer
2259 (setup_coding_system, coding_category, CATEGORY_MASK_ANY)
2260 (detected_mask): Remove Big5 bits.
2262 2003-04-09 Kenichi Handa <handa@m17n.org>
2264 The following changes are to make the font rescaling facility
2265 compatible with Emacs 21.
2267 * xfaces.c (Vface_font_rescale_alist): Renamed from
2268 Vface_resizing_fonts.
2269 (struct font_name): Rename member resizing_ratio to rescale_ratio.
2270 (font_rescale_ratio): Renamed from font_resizing_ratio.
2271 (split_font_name): Set font->rescale_ratio.
2272 (better_font_p): Pay attention to font->rescale_ratio.
2273 (build_scalable_font_name): Likewise. Change RESX, and RESY
2275 (syms_of_xfaces): Declare Vface_font_rescale_alist as a Lisp
2278 2003-03-28 Kenichi Handa <handa@m17n.org>
2280 * coding.c (Qutf_16_be_nosig, Qutf_16_be, Qutf_16_le_nosig)
2281 (Qutf_16_le): Remove these variables.
2282 (syms_of_coding): Don't DEFSYM them.
2283 (decode_coding_utf_16): Fix handling of BOM.
2284 (encode_coding_utf_16): Fix handling of BOM.
2286 2003-03-14 Kenichi Handa <handa@m17n.org>
2288 * fileio.c (Finsert_file_contents): On replacing, before decoding
2289 the file into the work buffer, set point of the work buffer to the
2292 2003-02-13 Dave Love <fx@gnu.org>
2294 * coding.c (Fcheck_coding_systems_region): Fix type errors.
2296 2003-02-04 Dave Love <fx@gnu.org>
2298 * xterm.c (XTread_socket): Check Lisp types for Vx_keysym_table
2301 2003-01-31 Kenichi Handa <handa@m17n.org>
2303 * xdisp.c (SKIP_GLYPHS): New macro.
2304 (set_cursor_from_row): Pay attention to string display properties.
2306 * category.c (copy_category_entry): Fix for the case that RANGE
2309 * xterm.c (x_encode_char): Call ccl_driver with the last arg Qnil.
2311 * w32term.c (w32_encode_char): Call ccl_driver with the last arg
2314 2003-01-30 Kenichi Handa <handa@m17n.org>
2316 * charset.c (Fcharset_id_internal): New function.
2317 (syms_of_charset): Defsubr it.
2319 * coding.c (decode_coding_ccl, encode_coding_ccl): Call ccl_driver
2320 with the last arg charset_list acquired from coding.
2321 (Fdefine_coding_system_internal): For ccl-based coding system, fix
2322 the attribute coding_attr_ccl_valids.
2324 * coding.h (enum define_coding_ccl_arg_index): Set the first
2325 member coding_arg_ccl_decoder to coding_arg_max.
2327 * ccl.h (ccl_driver): Prototype adjusted.
2329 * ccl.c (CCL_DECODE_CHAR, CCL_ENCODE_CHAR): New macros.
2330 (ccl_driver): New arg CHARSET_LIST. Use the above macros instead
2331 of DECODE_CAHR, ENCODE_CHAR, CHAR_CHARSET.
2332 (Fccl_execute): Call ccl_driver with the last arg Qnil.
2333 (Fccl_execute_on_string): Likewise.
2335 2003-01-11 Kenichi Handa <handa@m17n.org>
2337 * charset.h (ENCODE_CHAR): If the method is SUBSET or SUPERSET,
2340 * charset.c (encode_char): Fix handling of methods SUBSET and
2343 * xterm.c (x_new_fontset): Fix previous change.
2345 2003-01-10 Dave Love <fx@gnu.org>
2347 * composite.c (syms_of_composite): Make composition_hash_table
2350 2003-01-10 Kenichi Handa <handa@m17n.org>
2352 * dispextern.h (check_face_attributes, generate_ascii_font_name)
2353 (font_name_registry): Don't extern them.
2354 (split_font_name_into_vector, build_font_name_from_vector): Extern
2357 * fontset.h (Qfontset): Don't extern it.
2358 (new_fontset_from_font_name): Extern it.
2360 * fontset.c: Give 8 extra slots to fontset objects.
2361 (Qfontset_info): New variable.
2362 (syms_of_fontset): Defsym it.
2363 (FONTSET_FALLBACK): New macro.
2364 (fontset_face): Try also the default fontset.
2365 (make_fontset): Realize a fallback fontset from the default
2367 (generate_ascii_font_name): Moved from xfaces.c. Rewritten by
2368 using split_font_name_into_vector and build_font_name_from_vector.
2369 (Fset_fontset_font): Access the elements of font_spec by enum
2370 FONT_SPEC_INDEX. If font_spec is a string, extract the registry
2371 name by using split_font_name_into_vector.
2372 (Fnew_fontset): If no ASCII font is specified in FONTLIST,
2373 generate a proper font name from the fontset name. Update
2374 Vfontset_alias_alist.
2375 (n_auto_fontsets): New variable.
2376 (new_fontset_from_font_name): New function.
2377 (Ffont_info): Store the information about fonts generated from the
2378 default fontset in the first extra slot of the returned
2381 * xfaces.c (generate_ascii_font_name): Moved to fontset.c.
2382 (font_name_registry): Function deleted.
2383 (split_font_name_into_vector): New function.
2384 (build_font_name_from_vector): New function.
2385 (font_list): The argument REGISTRY is now a list of registry
2387 (choose_face_font): If we are choosing an ASCII font, and ATTRS
2388 specifies an explicit font name, return the name as is. Make a
2389 list of registy names.
2391 * xfns.c (x_set_font, x_create_tip_frame): Adjusted to the change
2393 (Fx_create_frame): Don't call x_new_fontset here. Just use
2394 x_list_fonts to check the existence of fonts.
2396 * xterm.h (x_new_fontset): Prototype adjusted.
2398 * xterm.c (x_new_fontset): Change the arg FONTSETNAME to Lisp
2399 string. Use new_fontset_from_font_name to create a fontset from a
2402 2003-01-07 Dave Love <fx@gnu.org>
2404 * Makefile.in: Fix some dependencies.
2406 * keymap.c (Fapropos_internal): Don't gcpro apropos_predicate but
2407 set it to nil before returning.
2409 * composite.c (update_compositions): Fix type error.
2411 * syntax.c (skip_chars, skip_syntaxes): Fix type errors.
2413 2003-01-07 Kenichi Handa <handa@m17n.org>
2415 * xterm.c (x_new_font): Optimize for the case that the font is
2416 already set for the frame.
2418 2003-01-06 Kenichi Handa <handa@m17n.org>
2420 * chartab.c (char_table_ascii): Check if the char table contents
2421 is sub-char-table or not.
2422 (char_table_set): Fix argument to char_table_ascii.
2423 (char_table_set_range): Likewise.
2425 * coding.c (CATEGORY_MASK_RAW_TEXT): New macro.
2426 (detect_coding_utf_8, detect_coding_utf_16)
2427 (detect_coding_emacs_mule, detect_coding_iso_2022)
2428 (detect_coding_sjis, detect_coding_big5)
2429 (detect_coding_ccl, detect_coding_charset): Change argument MASK
2430 to DETECT_INFO. Update DETECT_INFO and return 1 if the byte
2431 sequence is valid in this coding system. Callers changed.
2432 (MAX_ANNOTATION_LENGTH): New macro.
2433 (ADD_ANNOTATION_DATA): New macro.
2434 (ADD_COMPOSITION_DATA): Argument changed. Callers changed. Call
2435 ADD_ANNOTATION_DATA. The format of annotation data changed.
2436 (ADD_CHARSET_DATA): New macro.
2437 (emacs_mule_char): New argument ID. Callers changed.
2438 (decode_coding_emacs_mule, decode_coding_iso_2022)
2439 (decode_coding_sjis, decode_coding_big5, decode_coding_charset):
2440 Produce charset annotation data in coding->charbuf.
2441 (encode_coding_emacs_mule, encode_coding_iso_2022): Pay attention
2442 to charset annotation data in coding->charbuf.
2443 (setup_coding_system): Add CODING_ANNOTATE_CHARSET_MASK
2444 coding->common_flags if the coding system is iso-2022 based and
2446 (produce_composition): Adjusted for the new annotation data
2448 (produce_charset): New function.
2449 (produce_annotation): Handle charset annotation.
2450 (handle_composition_annotation, handle_charset_annotation): New
2452 (consume_chars): Handle charset annotation. Utilize the above two
2454 (encode_coding_object): If SRC_OBJECT and DST_OBJECT are the same
2455 buffer, get the deleted text as a string and set
2456 coding->src_object to that string.
2457 (detect_coding, detect_coding_system): Use the new struct
2458 coding_detection_info.
2460 * coding.h (struct coding_detection_info): New structure.
2461 (struct coding_system): Prototype of the member `detector'
2463 (CODING_ANNOTATE_CHARSET_MASK): New macro.
2465 2003-01-06 Kenichi Handa <handa@m17n.org>
2467 * insdel.c (insert_from_gap): Fix argument to offset_intervals.
2469 2003-01-03 Dave Love <fx@gnu.org>
2471 * keymap.c (apropos_predicate, apropos_accumulate): Declare
2473 (Fapropos_internal): Don't gcpro apropos_accumulate. Set result
2474 to new local and nullify apropos_accumulate before returning.
2475 (syms_of_keymap): Staticpro and initialize apropos_accumulate.
2477 2002-12-05 Kenichi Handa <handa@m17n.org>
2479 * charset.c (Fdefine_charset_internal): Setup charset.fast_map
2482 2002-11-26 Dave Love <fx@gnu.org>
2484 * fns.c (Flanginfo): Call synchronize_system_time_locale.
2486 2002-11-07 Kenichi Handa <handa@m17n.org>
2488 The following changes are to make character composition happen
2489 automatically on displaying.
2491 * Makefile.in (lisp, shortlisp): Add composite.elc
2493 * composite.h (Qauto_composed, Vauto_composition_function,
2494 Qauto_composition_function): Extern them.
2496 * composite.c (Vcomposition_function_table,
2497 Qcomposition_function_table): Delete variables.
2498 (Qauto_composed, Vauto_composition_function,
2499 Qauto_composition_function): New variables.
2500 (run_composition_function): Don't call
2501 compose-chars-after-function.
2502 (update_compositions): Clear `auto-composed' text property.
2503 (compose_chars_in_text): Delete this function.
2504 (syms_of_composite): Staticpro Qauto_composed and
2505 Qauto_composition_function. Declare Vauto_composition_function as
2508 * dispextern.h (enum prop_idx): Add member AUTO_COMPOSED_PROP_IDX.
2510 * xdisp.c (it_props): Add an entry for Qauto_composed.
2511 (handle_auto_composed_prop): New function.
2513 * xselect.c (selection_data_to_lisp_data): Don't call
2514 compose_chars_in_text.
2516 2002-11-06 Dave Love <fx@gnu.org>
2518 * keyboard.c (read_char): Modify checking around use of
2519 Vkeyboard_translate_table.
2521 * xterm.c (XTread_socket): Check Lisp types for Vx_keysym_table
2524 2002-11-06 Kenichi Handa <handa@m17n.org>
2526 * coding.c (decode_coding_utf_8): When eol_type is Qdos, handle
2527 the case that the last byte is '\r' correctly.
2528 (decode_coding_emacs_mule): Likewise.
2529 (decode_coding_iso_2022): Likewise.
2530 (decode_coding_sjis): Likewise.
2531 (decode_coding_big5): Likewise.
2532 (decode_coding_charset): Likewise.
2533 (produce_chars): Likewise.
2534 (decode_coding): Flushing out the unprocessed data correctly.
2535 (decode_coding_gap): Set CODING_MODE_LAST_BLOCK bit of
2538 2002-10-31 Dave Love <fx@gnu.org>
2540 * xterm.c (XTread_socket): Fix changes for defined keysyms. Add
2542 (xaw_scroll_callback): Revert last change.
2544 2002-10-30 Kenichi Handa <handa@m17n.org>
2546 * charset.c (Fset_charset_priority): Update
2547 Viso_2022_charset_list.
2549 2002-10-29 Kenichi Handa <handa@m17n.org>
2551 * xfaces.c (Vface_resizing_fonts): New variable.
2552 (struct font_name): New member `resizing_ratio'.
2553 (font_resizing_ratio): New function.
2554 (split_font_name): Set font->resizing_ratio.
2555 (better_font_p): Pay attention to font->resizing_ratio.
2556 (build_scalable_font_name): Likewise. Don't change POINT_SIZE,
2557 RESX, and RESY fields.
2558 (try_alternative_families): Try scalable fonts if
2559 Vscalable_fonts_allowed is not Qt.
2560 (syms_of_xfaces): Declare Vface_resizing_fonts as a Lisp variable.
2562 2002-10-29 Dave Love <fx@gnu.org>
2564 * xterm.c (xaw_scroll_callback): Cast correctly.
2566 2002-10-28 Dave Love <fx@gnu.org>
2568 * keyboard.c (lispy_accent_codes, lispy_accent_keys): Extend.
2569 (lispy_kana_keys): Comment out.
2570 (make_lispy_event) [XK_kana_A]: Comment out.
2572 * xterm.c (xaw_scroll_callback): Cast call_data.
2573 (XTread_socket): Deal with ASCII keysyms.
2574 (syms_of_xterm) <Vx_keysym_table>: Fix args of make_hash_table.
2576 2002-10-27 Dave Love <fx@gnu.org>
2578 * xterm.c (Vx_keysym_table): New.
2579 (syms_of_xterm): Initialize it.
2580 (XTread_socket): Use it.
2581 From head: Eliminate incorrect optimization that tried to avoid
2582 decoding the output of X*LookupString.
2583 (x_get_font_repertory): Delete charset declaration.
2585 2002-10-16 Kenichi Handa <handa@m17n.org>
2587 * coding.c (detect_coding): Fix previous change.
2588 (detect_coding_charset): If only ASCII bytes are found, return 0.
2589 (detect_coding_system): Fix previous change.
2590 (Fdefine_coding_system_internal): Setup CODING_ATTR_ASCII_COMPAT
2593 2002-10-15 Dave Love <fx@gnu.org>
2595 * coding.c (Fcheck_coding_system): Doc fix.
2597 * editfns.c (Finsert_byte): Return a proper value.
2599 2002-10-14 Kenichi Handa <handa@m17n.org>
2601 * coding.c (decode_coding): Fix args to translate_chars. Pay
2602 attention to Vstandard_translation_table_for_decode.
2603 (encode_coding): Fix args to translate_chars. Pay attention to
2604 Vstandard_translation_table_for_encode.
2606 * data.c (Faset): Check NEWELT by ASCII_CHAR_P, not by
2609 * editfns.c (general_insert_function): Check VAL by ASCII_CHAR_P,
2610 not by SINGLE_BYTE_CHAR_P.
2612 * fns.c (concat): Check CH by ASCII_CHAR_P, not by
2615 * insdel.c (copy_text): Check C by ASCII_CHAR_P, not by
2618 * keymap.c (Ftext_char_description): Check C by ASCII_CHAR_P, not
2619 by SINGLE_BYTE_CHAR_P.
2621 * search.c (Freplace_match): Check C by ASCII_CHAR_P, not by
2624 2002-10-14 Dave Love <fx@gnu.org>
2626 * fns.c (Fstring_as_multibyte, Fstring_to_multibyte): Doc fix.
2628 2002-10-10 Dave Love <fx@gnu.org>
2630 * fns.c (Flanginfo): Fix typo.
2632 * unexelf.c (unexec): Make last change conditional on Irix 6.5.
2634 2002-10-10 Kenichi Handa <handa@m17n.org>
2636 * coding.c (detect_coding_utf_8): Check incomplete byte sequence.
2637 Don't update *mask when correctly detected.
2638 (detect_coding_utf_16): Likewise.
2639 (detect_coding_emacs_mule): Likewise.
2640 (detect_coding_iso_2022): Likewise.
2641 (detect_coding_sjis): Likewise.
2642 (detect_coding_big5): Likewise.
2643 (detect_coding_ccl): Likewise.
2644 (decode_coding_sjis): Fix decoding of katakana-jisx0201.
2645 (detect_eol): Delete the argument CODING, and add the argument
2647 (detect_coding): Adjusted for the changes above.
2648 (detect_coding_system): Likewise.
2650 2002-10-09 Kenichi Handa <handa@m17n.org>
2652 * character.c (char_string): Renamed from
2653 char_string_with_unification. Pay attention to
2655 (string_char): Renamed from string_char.
2657 * character.h (CHAR_STRING): Call char_string if C is greater than
2659 (CHAR_STRING_ADVANCE): Likewise.
2660 (STRING_CHAR): Call string_char instead of
2661 string_char_with_unification.
2662 (STRING_CHAR_AND_LENGTH): Likewise.
2663 (STRING_CHAR_ADVANCE): Likewise.
2665 2002-10-09 Dave Love <fx@gnu.org>
2667 * coding.c (decode_coding_utf_8): Treat surrogates as invalid.
2669 2002-10-07 Kenichi Handa <handa@m17n.org>
2671 * keymap.c (push_key_description): Pay attention to
2674 * regex.c (re_search_2): Fix for the case of unibyte buffer.
2676 2002-10-06 Dave Love <fx@gnu.org>
2678 * charset.c (define_charset_internal): Rename `supprementary'.
2680 * Makefile.in (lisp, shortlisp): Remove latin-N.
2682 2002-10-05 Dave Love <fx@gnu.org>
2684 * xfns.c (x_window, x_window): Use use_xim.
2686 * xterm.c (use_xim): Initialize.
2687 (xim_open_dpy, xim_initialize, xim_close_dpy): Use use_xim.
2688 (x_term_init): Maybe set use_xim.
2690 * xterm.h (use_xim) [HAVE_X_I18N]: Declare.
2692 2002-10-01 Kenichi Handa <handa@m17n.org>
2694 * search.c (search_buffer): Fix case-fold-search of multibyte
2696 (boyer_moore): Rename the last argument to char_high_bits.
2698 2002-09-27 Kenichi Handa <handa@m17n.org>
2700 * xdisp.c (display_string): Fix for the case of zero width glyph.
2702 * xfns.c (x_set_font): Change the error message of the case that
2703 x_new_fontset returns Qt.
2705 * xfaces.c (set_lface_from_font_name): Reject the default fontset.
2706 (Finternal_set_lisp_face_attribute): Use signal_error for the
2707 error of invalid fontset.
2709 * xterm.c (x_new_fontset): If FONTSETNAME specifies the default
2712 2002-09-19 Kenichi Handa <handa@m17n.org>
2714 * regex.c (re_search_2): Fix previous change.
2716 2002-09-18 Kenichi Handa <handa@m17n.org>
2718 * syntax.c (skip_syntaxes): Fix previous change.
2720 2002-09-13 Kenichi Handa <handa@m17n.org>
2722 * syntax.c (skip_chars): Fix previous change.
2723 (skip_syntaxes): Fix previous change.
2725 2002-09-06 Dave Love <fx@gnu.org>
2727 * config.in: Restore it.
2729 2002-09-05 Dave Love <fx@gnu.org>
2731 * config.in: Removed (now auto-generated).
2733 * s/usg5-4.h: Fix last change.
2735 * unexelf.c (unexec): Make .got handling not SGI-specific.
2737 * syntax.c (syms_of_syntax) <multibyte-syntax-as-symbol>: Doc fix.
2739 * regex.c: Use `ifdef HAVE_ALLOCA_H', not `if HAVE_ALLOCA_H'.
2741 * keyboard.c (read_key_sequence): Fix type error.
2743 * buffer.c (Fset_buffer_multibyte, Fset_buffer_multibyte): Fix
2746 * fontset.c (fontset_add): Return Lisp_Object.
2748 2002-09-03 Dave Love <fx@gnu.org>
2750 * charset.h (charset_ordered_list_tick): Declare extern.
2752 2002-09-03 Kenichi Handa <handa@m17n.org>
2754 The following changes (and some of 2002-08-20 changes of mine) are
2755 for handling syntax, category, and case conversion for unibyte
2756 characters by converting them to multibyte on the fly. With these
2757 changes, we don't have to setup syntax and case tables for unibyte
2758 characters in each language environment.
2760 * abbrev.c (Fexpand_abbrev): Convert a unibyte character to
2761 multibyte if necessary.
2763 * bytecode.c (Fbyte_code): Likewise.
2765 * character.h (LEADING_CODE_LATIN_1_MIN)
2766 (LEADING_CODE_LATIN_1_MAX): New macros.
2767 (unibyte_to_multibyte_table): Extern it.
2768 (unibyte_char_to_multibyte): New macro.
2769 (MAKE_CHAR_MULTIBYTE): Use unibyte_to_multibyte_table.
2770 (CHAR_LEADING_CODE): New macro.
2771 (FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE): New macro.
2773 * character.c (unibyte_to_multibyte_table): New variable.
2774 (unibyte_char_to_multibyte): Move to character.h and defined as
2776 (multibyte_char_to_unibyte): If C is an eight-bit character,
2777 convert it to the corresponding byte value.
2779 * charset.c (Fset_unibyte_charset): If the dimension of CHARSET is
2780 not 1, singals an error. Update the elements of
2781 unibyte_to_multibyte_table.
2782 (init_charset_once): Initialize unibyte_to_multibyte_table.
2783 (syms_of_charset): Define the charset `iso-8859-1'.
2785 * casefiddle.c (casify_object): Fix previous change.
2787 * cmds.c (internal_self_insert): In a multibyte buffer, insert C
2788 as is without converting it to unibyte. In a unibyte buffer,
2789 convert C to multibyte before checking the syntax.
2791 * lisp.h (unibyte_char_to_multibyte): Extern deleted.
2793 * minibuf.c (Fminibuffer_complete_word): Use the macro
2794 FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE.
2796 * regex.h (struct re_pattern_buffer): New member target_multibyte.
2798 * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
2799 (GET_CHAR_BEFORE_2): Check target_multibyte, not multibyte. If
2800 that is zero, convert an eight-bit char to multibyte.
2801 (MAKE_CHAR_MULTIBYTE, CHAR_LEADING_CODE): New dummy new macros for
2803 (PATFETCH): Convert an eight-bit char to multibyte.
2804 (HANDLE_UNIBYTE_RANGE): New macro.
2805 (regex_compile): Setup the compiled pattern for multibyte chars
2806 even if the given regex string is unibyte. Use PATFETCH_RAW
2807 instead of PATFETCH in many places. To handle `charset'
2808 specification of unibyte, call HANDLE_UNIBYTE_RANGE. Use bitmap
2809 only for ASCII chars.
2810 (analyse_first) <exactn>: Simplified because the compiled pattern
2812 <charset_not>: Setup fastmap from bitmap only for ASCII chars.
2813 <charset>: Use CHAR_LEADING_CODE to get leading codes.
2814 <categoryspec>: If multibyte, setup fastmap only for ASCII chars
2816 (re_compile_fastmap) [emacs]: Call analyse_first with the arg
2818 (re_search_2) In emacs, set the locale variable multibyte to 1,
2819 otherwise to 0. New local variable target_multibyte. Check it
2820 to decide the multibyteness of STR1 and STR2. If
2821 target_multibyte is zero, convert unibyte chars to multibyte
2822 before translating and checking fastmap.
2823 (TARGET_CHAR_AND_LENGTH): New macro.
2824 (re_match_2_internal): In emacs, set the locale variable multibyte
2825 to 1, otherwise to 0. New local variable target_multibyte. Check
2826 it to decide the multibyteness of STR1 and STR2. Use
2827 TARGET_CHAR_AND_LENGTH to fetch a character from D.
2828 <charset, charset_not>: If multibyte is nonzero, check fastmap
2829 only for ASCII chars. Call bcmp_translate with
2830 target_multibyte, not with multibyte.
2831 <begline>: Declare the local variable C as `unsigned'.
2832 (bcmp_translate): Change the last arg name to target_multibyte.
2834 * search.c (compile_pattern_1): Don't adjust the multibyteness of
2835 the regexp pattern and the matching target. Set cp->buf.multibyte
2836 to the multibyteness of the regexp pattern. Set
2837 cp->but.target_multibyte to the multibyteness of the matching
2839 (wordify): Use FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE instead of
2840 FETCH_STRING_CHAR_ADVANCE.
2841 (Freplace_match): Convert unibyte chars to multibyte.
2843 * syntax.c (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
2844 unibyte chars to multibyte.
2845 (back_comment): Likewise.
2846 (scan_words): Likewise.
2847 (skip_chars): The arg syntaxp is deleted, and the code for
2848 handling syntaxes is moved to skip_syntaxes. Callers changed.
2849 Fix the case that the multibyteness of STRING and the current
2850 buffer doesn't match.
2851 (skip_syntaxes): New function.
2852 (SYNTAX_WITH_MULTIBYTE_CHECK): Check C by ASCII_CHAR_P, not by
2854 (Fforward_comment): Use FETCH_CHAR_AS_MULTIBYTE to convert unibyte
2856 (scan_lists): Likewise.
2857 (Fbackward_prefix_chars): Likewise.
2858 (scan_sexps_forward): Likewise.
2860 2002-08-23 Kenichi Handa <handa@m17n.org>
2862 * xfaces.c (QCfontset): New variable.
2863 (LFACE_FONTSET): New macro.
2864 (check_lface_attrs): Check also LFACE_FONTSET_INDEX.
2865 (set_lface_from_font_name): Setup LFACE_FONTSET (lface).
2866 (Finternal_set_lisp_face_attribute): Handle QCfontset.
2867 (Finternal_get_lisp_face_attribute): Likewise.
2868 (lface_same_font_attributes_p): Fix checking of LFACE_FONT_INDEX,
2869 check also LFACE_FONTSET_INDEX.
2870 (face_fontset): Check attrs[LFACE_FONTSET_INDEX], not
2871 attrs[LFACE_FONT_INDEX].
2872 (syms_of_xfaces): Intern and staticpro QCfontset.
2874 * dispextern.h (enum lface_attribute_index): New member
2875 LFACE_FONTSET_INDEX.
2877 * fns.c (base64_encode_1): Handle eight-bit chars correctly.
2879 2002-08-21 Kenichi Handa <handa@m17n.org>
2881 * coding.c (coding_set_destination): Fix coding->destination for
2882 the case converting a region.
2883 (encode_coding_utf_8): Encode eight-bit chars as single byte.
2884 (encode_coding_object): Fix coding->dst_pos and
2885 coding->dst_pos_byte for the case converting a region.
2887 * insdel.c (insert_from_gap): Make it work even if PT != GTP.
2889 * character.h (BYTE8_STRING): New macro.
2891 * fns.c (base64_decode_1): Insert eight-bit chars correctly.
2893 2002-08-20 Kenichi Handa <handa@m17n.org>
2895 * xdisp.c (get_next_display_element): Don't display unibyte 8-bit
2896 characters by octal form.
2898 * abbrev.c (Fexpand_abbrev): Fix for the multibyte case.
2900 * buffer.h (_fetch_multibyte_char_len): Extern deleted.
2901 (FETCH_MULTIBYTE_CHAR): Don't use _fetch_multibyte_char_len.
2902 (BUF_FETCH_MULTIBYTE_CHAR): Likewise.
2903 (FETCH_CHAR_AS_MULTIBYTE): New macro.
2905 * casetab.c (set_canon, set_identity, shuffle): Simplified.
2907 * casefiddle.c (casify_object): Simplified. Handle the case that
2908 the case conversion change the byte length.
2909 (casify_region): Likewise
2911 * character.h (MAKE_CHAR_UNIBYTE, MAKE_CHAR_MULTIBYTE): New
2914 * character.c (_fetch_multibyte_char_len): This variable deleted.
2915 (syms_of_character): Setup Vprintable_chars.
2917 * editfns.c (Fchar_equal): Fix for the unibyte case.
2918 (Finsert_byte): New function.
2919 (syms_of_editfns): Defsubr it.
2921 * keyboard.c (read_key_sequence): Use ~CHAR_MODIFIER_MASK instead
2922 of direct code 0x3ffff.
2924 * search.c (Freplace_match): Fix for the unibyte case.
2926 2002-08-19 Kenichi Handa <handa@m17n.org>
2928 * lread.c (safe_to_load_p): Fix the logic.
2930 * syntax.c (scan_words): Don't treat characters belonging to
2931 different scripts as constituting a word.
2933 * editfns.c (Fformat): Use ASCII_CHAR_P, not SINGLE_BYTE_CHAR_P.
2935 * fontset.c (Fset_fontset_font): Treat `ascii' as charset, not
2938 * emacs.c (main): In the case of --unibyte, instead of aborting on
2939 finding non-empty buffer, make it unibyte.
2941 2002-08-18 Kenichi Handa <handa@m17n.org>
2943 * xterm.c (x_new_fontset): Call `create-fontset-from-ascii-font'
2944 to create a fontset.
2946 2002-08-18 Dave Love <fx@gnu.org>
2948 * character.c (Funibyte_char_to_multibyte): Doc fix.
2950 * xfns.c [HAVE_STDLIB_H]: Fix last change.
2952 2002-08-15 Kenichi Handa <handa@m17n.org>
2954 * fontset.c (fontset_add): Make the type `int'.
2955 (fontset_id_valid_p): Define it if FONTSET_DEBUG is defined.
2957 * character.c (unibyte_char_to_multibyte): Refer to
2958 charset_unibyte, not charset_primary.
2959 (multibyte_char_to_unibyte): Likewise.
2960 (Funibyte_char_to_multibyte): Likewise.
2962 * charset.h: (charset_unibyte): Extern it instead of
2965 * charset.c (charset_unibyte): Renamed from charset_primary.
2966 (Funibyte_charset): Renamed from Fprimary_charset.
2967 (Fset_unibyte_charset): Renamed from Fset_primary_charset.
2968 (syms_of_charset): Adjusted for the above changes.
2970 * w32term.c (x_produce_glyphs): Use ASCII_CHAR_P, not
2971 SINGLE_BYTE_CHAR_P. Fix the logic of handling non-ASCII char when
2972 it->multibyte_p is zero.
2974 * lisp.h (nonascii_insert_offset, Vnonascii_translation_table):
2977 2002-08-08 Kenichi Handa <handa@m17n.org>
2979 * coding.c (Fdefine_coding_system_internal): Fix category setting
2980 for a coding system of type iso-2022.
2982 2002-08-02 Kenichi Handa <handa@m17n.org>
2984 * fontset.h (FS_LOAD_FONT): Call fs_load_font with the arg CHARSET
2987 2002-08-01 Kenichi Handa <handa@m17n.org>
2989 * syntax.c (Vnext_word_boundary_function_table): New variable.
2990 (syms_of_syntax): Declare it as a Lisp variable.
2991 (scan_words): Call functions in Vnext_word_boundary_function_table
2994 * xterm.c (x_load_font): Initialize fontp->fontset to -1.
2996 * fontset.c (fs_load_font): If fontp->charset is not negative,
2997 return fontp without setting its members.
2999 2002-07-31 Dave Love <fx@gnu.org>
3001 * config.in: Generated with autoheader.
3003 * xfns.c [HAVE_STDLIB_H]: Change logic (instead of fixing typo).
3005 * m/sparc.h (HAVE_ALLOCA): Delete.
3007 * s/irix6-5.h: Don't include strings.h.
3008 (bcopy, bzero, bcmp): Don't undef.
3010 * s/irix6-0.h (bcopy, bzero, bcmp): Don't undef.
3012 * s/usg5-4.h (NO_SIOCTL_H): Don't define.
3013 (TIOCSIGSEND): Don't test IRIX6.
3014 (bcopy, bzero, bcmp): Define conditionally.
3016 2002-07-31 Kenichi Handa <handa@m17n.org>
3018 * buffer.c (Qas, Qmake, Qto): New variables.
3019 (Fset_buffer_multibyte): New optional arg METHOD. Caller changed.
3020 (syms_of_buffer): Intern and staticpro Qas, Qmake, and Qto.
3022 * callproc.c (Fcall_process): Don't call insert_1_both directly if
3023 we are inserting a process output into a multibyte buffer.
3025 * character.h (CHAR_TO_BYTE8): If C is not eight-bit char, call
3026 multibyte_char_to_unibyte.
3028 * character.c (Funibyte_char_to_multibyte): If C can't be decoded
3029 by the primary charset, make it eight-bit char.
3030 (Fmultibyte_char_to_unibyte): Call CHAR_TO_BYTE8.
3032 * charset.c: (charset_eight_bit, Qeight_bit_control): New
3034 (charset_8_bit__control, charset_8_bit_graphic,
3035 Qeight_bit_control, Qeight_bit_graphic): These variables deleted.
3036 (define_charset_internal): New function.
3037 (syms_of_charset): Call define_charset_internal for pre-defined
3040 * charset.h (charset_8_bit): Extern it.
3042 * coding.c (make_conversion_work_buffer): Adjusted for the change
3043 of Fset_buffer_multibyte.
3044 (encode_coding_raw_text): Increment p0 in the loop.
3046 * lisp.h (Fset_buffer_multibyte): Prototype adjusted.
3048 * xdisp.c (setup_echo_area_for_printing, set_message_1): Adjusted
3049 for the change of Fset_buffer_multibyte.
3051 * fns.c (Fstring_to_multibyte): New function.
3052 (syms_of_fns): Declare Fstring_to_multibyte as Lisp subroutine.
3054 2002-07-30 Dave Love <fx@gnu.org>
3056 * xfns.c (x_put_x_image): Declare args.
3058 * xfaces.c (font_name_registry, choose_face_font): Delete unused
3060 (try_font_list): Declare an arg.
3062 * xdisp.c (message2_nolog, set_message): Declare an arg.
3064 * terminfo.c (tparam): Declare an arg. Use P_ to declare tparm.
3066 * syntax.c (scan_sexps_forward): Declare an arg.
3068 * scroll.c (calculate_scrolling, calculate_direct_scrolling):
3071 * lisp.h (Fnew_fontset): Declare.
3073 * keymap.c (push_key_description): Call CHARACTERP correctly.
3075 * fontset.c (fontset_add): Declare args. Call make_number
3077 (face_for_char): Delete unused vars.
3078 (Fset_fontset_font): Doc fix. Delete unused vars.
3080 * doc.c (Fsubstitute_command_keys): Delete unused vars.
3082 * composite.c (update_compositions): Declare arg.
3084 * cm.c (calccost, cmgoto): Declare args.
3086 * charset.c: Remove `emacs' conditional. Doc fixes.
3087 (map_char_table_for_charset): Declare.
3089 * character.c (syms_of_character) <translation-table-vector>: Doc
3092 * ccl.c: Remove `emacs' conditional. Include hash table stuff
3095 2002-07-26 Kenichi Handa <handa@m17n.org>
3097 The following changes are to allow specifying multiple font
3098 patterns for a character range (specified by script or charset).
3100 * Makefile.in (abbrev.o): Depend on syntax.h.
3101 (xfaces.o): Depend on charset.h.
3103 * alloc.c (Fmake_string): Use ASCII_CHAR_P, not
3106 * ccl.c (Fccl_execute_on_string): Add `const' to local variables.
3108 * character.h (Vchar_script_table): Extern it.
3110 * character.c (Vscript_alist): This variable deleted.
3111 (Vchar_script_table, Qchar_script_table): New variable.
3112 (syms_of_character): Declare Vchar_script_table as a lisp variable
3115 * chartab.c (Fmake_char_table): Doc fixed. If PURPOSE doesn't
3116 have property char-table-extra-slots, make no extra slot.
3118 * dispextern.h (struct face): Member `charset' deleted.
3119 (FACE_SUITABLE_FOR_CHAR_P): Use ASCII_CHAR_P, not
3121 (FACE_FOR_CHAR): Likewise.
3122 (choose_face_font, lookup_non_ascii_face, font_name_registry): Add
3124 (lookup_face, lookup_named_face, lookup_derived_face): Prototype
3126 (generate_ascii_font_name): Renamed from generate_ascii_font.
3128 * fontset.h (get_font_repertory_func): New prototype.
3129 (make_fontset_for_ascii_face, fs_load_font): Prototypes fixed.
3130 (FS_LOAD_FONT): Call fs_load_font with the 3rd arg charset_ascii.
3132 * fontset.c (Qprepend, Qappend): New variables.
3133 (FONTSET_CHARSET_ALIST, FONTSET_FACE_ALIST): These macros deleted.
3134 (FONTSET_NOFONT_FACE, FONTSET_REPERTORY): New macros.
3135 (FONTSET_REF): Optimize if FONTSET is Vdefault_fontset.
3136 (FONTSET_REF_AND_RANGE, FONTSET_ADD): New macros.
3137 (fontset_ref_and_range, fontset_add, reorder_font_vector)
3138 (load_font_get_repertory): New functions.
3139 (fontset_set): This function deleted.
3140 (fontset_face): New arg FACE. Return face ID, not face.
3141 Completely re-written to handle new fontset structure. Caller
3143 (free_face_fontset): Use ASET istead of AREF (X) = Y.
3144 (face_for_char): Don't call lookup_face.
3145 (make_fontset_for_ascii_face): New arg FACE.
3146 (fs_load_font): New arg CHARSET_ID. Don't check
3147 Vfont_encoding_alist here.
3148 (find_font_encoding): New function.
3149 (list_fontsets): Use STRINGP, not ! NILP.
3150 (accumulate_script_ranges): New function.
3151 (Fset_fontset_font, Fnew_fontset, Ffontset_info): Completely
3152 re-written to handle new fontset structure.
3153 (Ffontset_font): Return a copy of element.
3154 (syms_of_fontset): Define symbols Qprepend and Qappend. Fix
3155 docstring of font-encoding-alist.
3157 * lisp.h (CHAR_TABLE_REF): Remove unnecessary check (IDX >= 0).
3158 (Fset_fotset_font): Fix arguments to 5.
3160 * msdos.c (XMenuActivate): Adjuted for the change of
3161 lookup_derived_face.
3163 * xdisp.c (message_dolog, set_message_1, extend_face_to_end_of_line):
3164 Use ASCII_CHAR_P, not SINGLE_BYTE_CHAR_P.
3165 (highlight_trailing_whitespace): Adjusted for the change of
3168 * xfaces.c: Include charset.h.
3169 (load_face_font): Argument C deleted. Caller changed.
3170 (generate_ascii_font_name): Renamed from generate_ascii_font.
3171 (font_name_registry): New function.
3172 (cache_face): Store ascii faces before non-ascii faces in buckets.
3173 (lookup_face): Arguments C and BASE_FACE deleted. Caller changed.
3174 Lookup only ascii faces.
3175 (lookup_non_ascii_face): New function.
3176 (lookup_named_face): Argument C deleted. Caller changed.
3177 (lookup_derived_face): Argument C deleted. Caller changed.
3178 (try_font_list): New arg PATTERN. Caller changed. If PATTERN is
3179 a string, just call font_list with it.
3180 (choose_face_font): Arguments FACE and C deleted. New arg
3181 FONT_SPEC. Caller changed.
3182 (realize_face): Arguments C and BASE_FACE deleted. Caller
3183 (realize_x_face): Likewise.
3184 (realize_non_ascii_face): New function.
3185 (realize_x_face): Call load_face_font here.
3186 (realize_tty_face): Argument C deleted. Caller changed.
3187 (compute_char_face): If CH is not ascii, call FACE_FOR_CHAR to
3189 (dump_realized_face): Don't print charset of FACE.
3191 * xfns.c (x_set_font): Always call x_new_fontset and
3192 store_frame_parameter.
3193 (Fx_create_frame): Call x_new_fontset, not x_new_font.
3194 (syms_of_xfns): Set get_font_repertory_func to
3195 x_get_font_repertory.
3197 * xterm.h (x_get_font_repertory): Extern it.
3199 * xterm.c (x_produce_glyphs): Use ASCII_CHAR_P, not
3200 SINGLE_BYTE_CHAR_P. Fix the logic of handling non-ASCII char when
3201 it->multibyte_p is zero.
3202 (XTread_socket): Use ASCII_CHAR_P, not SINGLE_BYTE_CHAR_P.
3203 (x_new_fontset): If FONTSETNAME doesn't match any existing
3204 fontsets, create a new one.
3205 (x_get_font_repertory): New function.
3207 2002-07-25 Kenichi Handa <handa@m17n.org>
3209 * coding.c (Ffind_coding_systems_region_internal): Detect an
3210 ASCII only string correctly.
3212 * lread.c (Fload): Don't load with Qload_force_doc_strings t if
3215 2002-07-24 Kenichi Handa <handa@m17n.org>
3217 * lread.c: Include "coding.h".
3218 (Qget_emacs_mule_file_char, Qload_force_doc_strings,
3219 load_each_byte, unread_char): New variables.
3220 (readchar_backlog): This variable deleted.
3221 (readchar): Return a character unless load_each_byte is nonzero.
3222 Handle the case that readcharfun is Qget_emacs_mule_file_char or a
3223 cons. If unread_char is not -1, simply return it.
3224 (unreadchar): Handle the case that readcharfun is
3225 Qget_emacs_mule_file_char or a cons. Set unread_char if
3227 (read_multibyte): This function deleted.
3228 (readbyte_for_lambda, readbyte_from_file, readbyte_from_string)
3229 (read_emacs_mule_char): New functions.
3230 (Fload): Even if the file doesn't have the extention ".elc", if
3231 safe_to_load_p returns a positive version number, assume that the
3232 file contains bytecompiled code. If the version is less than 22,
3233 load the file while decoding multibyte sequences by emacs-mule.
3234 (readevalloop): Don't use readchar_backlog.
3235 (Fread): Likewise. Pay attention to the case that STREAM is a
3237 (Fread_from_string): Pay attention to the case that STREAM is a
3239 (read_escape): The arg BYTEREP deleted.
3240 (read1): Set load_each_byte to 1 temporarily while handling
3241 #@NUMBER. Don't call read_multibyte.
3242 (read_vector): Call Fread with a cons. If readcharfun is
3243 Qget_emacs_mule_file_char, decode the read string by emacs-mule.
3244 (read_list): If doc_reference is 2, make the cdr part string as
3246 (syms_of_lread): Intern and staticpro Qget_emacs_mule_file_char
3247 and Qload_force_doc_strings.
3249 2002-07-23 Kenichi Handa <handa@m17n.org>
3251 * xdisp.c (face_before_or_after_it_pos): Call
3252 FETCH_MULTIBYTE_CHAR with byte postion, not char position.
3254 2002-07-22 Kenichi Handa <handa@m17n.org>
3256 * character.h (TRAILING_CODE_P): New macro.
3257 (MAYBE_UNIFY_CHAR): Adjusted for the change of Funify_charset.
3258 (string_char_with_unification): Fix prototype.
3259 (Vscript_alist): Extern it.
3261 * character.c (Vscript_alist): New variable.
3262 (string_char_with_unification): Add `const' to local variables.
3263 (str_as_unibyte): Likewise.
3264 (string_escape_byte8): Likewise.
3265 (syms_of_character): Declare script-alist as a Lisp variable.
3267 * charset.h (Vcharset_ordered_list): Extern it.
3268 (charset_ordered_list_tick): Extern it.
3269 (EMACS_MULE_LEADING_CODE_PRIVATE_11)
3270 (EMACS_MULE_LEADING_CODE_PRIVATE_12)
3271 (EMACS_MULE_LEADING_CODE_PRIVATE_21)
3272 (EMACS_MULE_LEADING_CODE_PRIVATE_22): New macros
3273 (Funify_charset): Adjusted for the change of Funify_charset.
3275 * charset.c (charset_ordered_list_tick): New variable.
3276 (Fdefine_charset_internal): Increment charset_ordered_list_tick.
3277 (Funify_charset): New optional arg DEUNIFY. If it is non-nil,
3278 deunify intead of unify a charset.
3279 (string_xstring_p): Add `const' to local variables.
3280 (find_charsets_in_text): Add `const' to arguemnts and local
3282 (encode_char): Adjusted for the change of Funify_charset. Fix
3283 detecting of invalid code.
3284 (Fset_charset_priority): Increment charset_ordered_list_tick.
3285 (Fmap_charset_chars): Fix handling of default value for FROM_CODE
3288 * coding.c (LEADING_CODE_PRIVATE_11, LEADING_CODE_PRIVATE_12)
3289 (LEADING_CODE_PRIVATE_21, LEADING_CODE_PRIVATE_22): Macros
3290 deleted. Callers changed to use
3291 EMACS_MULE_LEADING_CODE_PRIVATE_11, etc.
3292 (decode_coding_ccl): Add `const' to local variables.
3293 (consume_chars): Likewise.
3294 (Ffind_coding_systems_region_internal): Likewise.
3295 (Fcheck_coding_systems_region): Likewise.
3297 * print.c (print_object): Use octal form for printing the
3298 contents of a bool vector.
3300 2002-07-18 Dave Love <fx@gnu.org>
3302 * lread.c (Fload) <!load_dangerous_libraries>: Don't leak fd.
3303 <version == 20>: Refuse to load.
3305 2002-07-17 Dave Love <fx@gnu.org>
3307 * fns.c: Move coding.h.
3308 (Qcodeset, Qdays, Qmonths): New.
3309 (concat): Use CHARACTERP instead of INTERGERP.
3310 (Flocale_codeset): Deleted.
3311 (Flanginfo): New function.
3312 (syms_of_fns): Changed accordingly.
3314 * coding.c (adjust_coding_eol_type): Fix eol_type/eol_seen mixup.
3316 2002-07-16 Dave Love <fx@gnu.org>
3318 * casetab.c (init_casetab_once, init_casetab_once): Fix
3319 CHAR_TABLE_SET call.
3321 * category.c (Fmodify_category_entry): Fix CATEGORY_MEMBER call.
3323 * character.c (syms_of_character): Fix CHAR_TABLE_SET call.
3325 * charset.c (Fmap_charset_chars): Check args. Convert Lisp types.
3326 (load_charset_map, Fdeclare_equiv_charset, Fencode_char)
3327 (Fset_charset_priority, syms_of_charset): Convert Lisp types.
3329 * charset.h (CHECK_CHARSET_GET_ID): Use XINT on AREF result.
3331 * coding.c (ENCODE_DESIGNATION, decode_eol)
3332 (make_conversion_work_buffer, code_conversion_restore)
3333 (Fdefine_coding_system_internal): Convert Lisp types.
3334 (code_conversion_restore): Use EQ, not ==.
3335 (Fencode_coding_string): Fix code_convert_string call.
3337 * coding.h (code_convert_region): Fix prototype.
3339 * dispextern.h (redraw_frame, redraw_garbaged_frames): Removed.
3341 * fontset.c (fontset_ref, fontset_set, fs_load_font)
3342 (Ffontset_info): Convert Lisp types.
3344 * syntax.h (SYNTAX_ENTRY_INT): Don't use make_number.
3346 * xterm.c (note_mouse_movement): Fix call of window_from_coordinates.
3348 * xdisp.c (display_mode_element): Fix call of Fset_text_properties.
3350 * chartab.c: Include "...h", not <...h> in some cases.
3352 * callproc.c (Fcall_process): Remove unused variables.
3354 2002-07-12 Dave Love <fx@gnu.org>
3356 * coding.c (Fset_coding_system_priority): Allow null arg list.
3358 2002-07-03 Dave Love <fx@gnu.org>
3360 * minibuf.c (Fminibuffer_complete_word): Remove unused var.
3361 (Fself_insert_and_exit): Use CHARACTERP.
3363 * callproc.c (Fcall_process): Remove unused vars.
3365 * xterm.c (XTread_socket): Add extra dead keysyms.
3367 * xdisp.c (decode_mode_spec_coding): Use CHARACTERP.
3369 * dispextern.h: Remove prototypes for redraw_frame,
3370 redraw_garbaged_frames.
3372 * cmds.c (Fself_insert_command): Use CHARACTERP.
3374 * chartab.c (make_sub_char_table): Remove unused var.
3375 (Fset_char_table_default, Fmap_char_table): Doc fix.
3377 * keymap.c (access_keymap): Remove generic char code.
3378 (push_key_description): Use CHARACTERP.
3380 2002-07-01 Dave Love <fx@gnu.org>
3382 * charset.c: Doc fixes.
3383 (Funify_charset): Extra checking.
3385 2002-06-24 Dave Love <fx@gnu.org>
3387 * lread.c: Remove some unused variables.
3388 (safe_to_load_p): If safe, return the magic number version byte.
3389 (Fload): Maybe use load-with-code-conversion.
3391 2002-06-12 Kenichi Handa <handa@m17n.org>
3393 * category.c (Fmodify_category_entry): Don't modify the contents
3394 of category_set for characters out of the range. Avoid
3395 unnecessary modification.
3397 * character.h (MAYBE_UNIFY_CHAR): Adjusted for the change of
3398 Vchar_unify_table. The default value of the table is now nil.
3400 * character.c (syms_of_character): Setup Vchar_width_table for
3401 eight-bit-control and raw-byte chars.
3403 * charset.h (enum define_charset_arg_index): Delete
3404 charset_arg_parents and add charset_arg_subset and
3405 charset_arg_superset.
3406 (enum charset_attr_index): Delete charset_parents and add
3407 charset_subset and charset_superset.
3408 (enum charset_method): Delete CHARSET_METHOD_INHERIT and add
3409 CHARSET_METHOD_SUBSET and CHARSET_METHOD_SUPERSET.
3410 (CHARSET_ATTR_PARENTS, CHARSET_PARENTS): Macros deleted.
3411 (CHARSET_ATTR_SUBSET, CHARSET_ATTR_SUPERSET, CHARSET_SUBSET)
3412 (CHARSET_SUPERSET): New macros.
3413 (charset_work): Extern it.
3414 (ENCODE_CHAR): Use charset_work.
3415 (CHAR_CHARSET_P): Adjusted for the change of encoder format.
3416 (map_charset_chars): Extern it.
3418 * charset.c (load_charset_map): Set the default value of encoder
3419 and deunifier char-tables to nil.
3420 (map_charset_chars): Argument changed. Callers changed. Use
3421 map_char_table_for_charset instead of map_char_table.
3422 (Fmap_charset_chars): New optional args from_code and to_code.
3423 (Fdefine_charset_internal): Adjusted for the change of
3424 `define-charset' (:parents -> :subset or :superset).
3425 (charset_work): New variable.
3426 (encode_char): Adjusted for the change of
3427 Fdefine_charset_internal.
3428 (syms_of_charset): Likewise.
3429 (Ffind_charset_string): Setup the vector `charsets' correctly.
3431 * chartab.c (sub_char_table_ref_and_range): New arg defalt. Fix
3432 the previous change.
3433 (char_table_ref_and_range): Adjusted for the above change.
3434 (map_sub_char_table_for_charset): New function.
3435 (map_char_table_for_charset): New function.
3437 * keymap.c (describe_vector): Handle a char-table directly here.
3438 (describe_char_table): Deleted.
3440 * lisp.h (map_charset_chars): Deleted.
3442 2002-06-11 Dave Love <fx@gnu.org>
3444 * fns.c (count_combining): Comment out (unused).
3445 (Flocale_codeset): New.
3446 (syms_of_fns): Defsubr it.
3448 * config.in (HAVE_PTY_H, HAVE_SIZE_T, HAVE_LANGINFO_CODESET): New.
3451 2002-06-06 Dave Love <fx@gnu.org>
3453 * Makefile.in (chartab.o): Depend on charset.h
3455 2002-06-03 Kenichi Handa <handa@m17n.org>
3457 * character.c (syms_of_character): Set the default value of
3458 Vprintable_chars to Qnil.
3460 2002-05-31 Dave Love <fx@gnu.org>
3462 * Makefile.in (lisp, shortlisp): Change indian.elc to indian.el.
3464 2002-05-31 Kenichi Handa <handa@m17n.org>
3466 * charset.c (load_charset_map): Handle the case that from < to
3469 * coding.c (encode_coding_emacs_mule): Pay attention to raw-8-bit
3471 (encode_coding_iso_2022): Likewise.
3472 (encode_coding_sjis): Likewise.
3473 (encode_coding_big5): Likewise.
3474 (encode_coding_charset): Likewise.
3476 2002-05-30 Kenichi Handa <handa@m17n.org>
3478 * Makefile.in (lisp): Change chinese.elc to chinese.el. They are
3479 not bytecompiled now.
3480 (shortlisp): Likewise.
3482 * charset.c (charset_jisx0201_roman, charset_jisx0208_1978)
3483 (charset_jisx0208): New variables.
3484 (Fdefine_charset_internal): Setup them if appropriate.
3485 (init_charset_once): Initialize them to -1.
3487 * charset.h (charset_jisx0201_roman, charset_jisx0208_1978,
3488 charset_jisx0208): Extern them.
3490 * coding.c (CODING_ISO_FLAG_USE_ROMAN): New macro
3491 (CODING_ISO_FLAG_USE_OLDJIS): New macro.
3492 (CODING_ISO_FLAG_FULL_SUPPORT): Macro definition changed.
3493 (setup_iso_safe_charsets): Fix arguemtns to Fassq.
3494 (DECODE_DESIGNATION): Pay attention to CODING_ISO_FLAG_USE_ROMAN
3495 and CODING_ISO_FLAG_USE_OLDJIS.
3496 (ENCODE_ISO_CHARACTER_DIMENSION1): Likewise.
3497 (ENCODE_ISO_CHARACTER_DIMENSION2): Likewise.
3498 (encode_coding_iso_2022): Change the 1st arg to
3499 ENCODE_ISO_CHARACTER to a variable.
3501 2002-05-29 Kenichi Handa <handa@m17n.org>
3503 * charset.h (enum define_charset_arg_index): New enums
3504 charset_arg_min_code and charset_arg_max_code.
3505 (struct charset): New member char_index_offset.
3507 * charset.c (CODE_POINT_TO_INDEX): Take charset->char_index_offset
3509 (INDEX_TO_CODE_POINT): Likewise.
3510 (Fdefine_charset_internal): Handle args[charset_arg_min_code] and
3511 args[charset_arg_max_code]. Setup charset.char_index_offset.
3512 (syms_of_charset): Fix args to Fdefine_charset_internal.
3514 2002-05-27 Dave Love <fx@gnu.org>
3516 * coding.c (decode_coding_utf_8): Reject overlong sequences.
3518 2002-05-26 Dave Love <fx@gnu.org>
3520 * coding.c: Doc fixes.
3521 (Fcoding_system_aliases): Fix return value.
3522 (Qmac): Remove (duplicated) definition.
3524 2002-05-25 Dave Love <fx@gnu.org>
3526 * charset.c (Fcharset_priority_list, Fset_charset_priority): New
3529 * character.c (Fstring): Doc fix.
3531 * charset.c (Fdefine_charset_alias): Update Vcharset_list.
3533 * fontset.c (Ffontset_info): Doc fix. Return charset names, not
3535 (font-encoding-alist): Doc fix.
3537 2002-05-24 Dave Love <fx@gnu.org>
3539 * term.c (costs_set): Declare static, non-initialized for pcc.
3540 (encode_terminal_code): Remove ensued var.
3542 * keyboard.c (kbd_buffer_store_event): Fix interrupt_signal decl
3545 * xterm.c (xlwmenu_window_p): Fix prototype for K&R.
3547 * coding.c (setup_iso_safe_charsets): Fix arg decl for K&R.
3548 (suffixes): Moved out of make_subsidiaries for K&R.
3550 * charset.c (map_charset_chars): Fix c_function declaration for
3553 * lisp.h (DEFUN) [!PROTOTYPES]: Remove spurious `args'.
3555 2002-05-23 Dave Love <fx@gnu.org>
3557 * data.c (Fchar_or_string_p): Doc fix. Use CHARACTERP.
3559 * category.c (Fmodify_category_entry): Doc fix. Remove unused
3562 2002-05-23 Yong Lu <lyongu@asia-infonet.com>
3564 * charset.c (Fdefine_charset_internal): Fix argument to bzero.
3566 * coding.c (Fdefine_coding_system_internal): Fix previous change.
3567 (decode_coding_charset): Workaround for the bug of GCC 2.96.
3569 2002-05-23 Kenichi Handa <handa@m17n.org>
3571 * Makefile.in (lisp): Change cyrillic.elc to cyrillic.el,
3572 vietnamese.elc to vietnamese.el. They are not bytecompiled now.
3573 (shortlisp): Likewise.
3575 2002-05-22 Kenichi Handa <handa@m17n.org>
3577 * coding.c (decode_coding_charset): Adjusted for the change of
3578 Fdefine_coding_system_internal.
3579 (Fdefine_coding_system_internal): For a coding system of
3580 `charset' type, store a list of charset IDs in
3581 `charset_attr_charset_valids' element of coding attributes.
3583 * charset.c (Fmake_char): Fix previous change.
3585 2002-05-21 Kenichi Handa <handa@m17n.org>
3587 * coding.c (ONE_MORE_BYTE_NO_CHECK): Increment consumed_chars.
3588 (emacs_mule_char): New arg src. Delete arg `composition'. Caller
3589 changed. Handle 2-byte and 3-byte charsets correctly.
3590 (DECODE_EMACS_MULE_COMPOSITION_RULE_20): Renamed from
3591 DECODE_EMACS_MULE_COMPOSITION_RULE. Caller changed.
3592 (DECODE_EMACS_MULE_COMPOSITION_RULE_21): New macro.
3593 (DECODE_EMACS_MULE_21_COMPOSITION): Call
3594 DECODE_EMACS_MULE_COMPOSITION_RULE_21. Produce correct annotation
3596 (decode_coding_emacs_mule): Handle composition correctly. Rewind
3597 `src' and `consumed_chars' correctly before calling
3599 (DECODE_COMPOSITION_START): Correctly handle the case of altchar
3600 and alt&rule composition.
3601 (decode_coding_iso_2022): Handle composition correctly.
3602 (init_coding_once): Setup emacs_mule_bytes for private charsets.
3604 * charset.c (Fdefine_charset_internal): Fix bug for the case of
3605 re-defining a charset. If the charset has :emacs-mule-id, setup
3607 (Fmake_char): If CODE1 is nil, use the minimum code of the
3610 2002-05-20 Kenichi Handa <handa@m17n.org>
3612 * coding.c (encode_coding_iso_2022): If coding requires safe
3613 encoding, produce a character specified by
3614 CODING_INHIBIT_CHARACTER_SUBSTITUTION.
3615 (encode_coding_sjis): Likewise.
3616 (encode_coding_big5): Likewise.
3617 (encode_coding_charset): Likewise.
3619 2002-05-17 Dave Love <fx@gnu.org>
3621 * xterm.c (XSetIMValues): Declare.
3623 * process.c: Conditionally include sys/wait.h, pty.h.
3625 * print.c (print_object): Fix print format for 64-bit
3628 * keyboard.c (modify_event_symbol): Fix print format for 64-bit
3631 * buffer.c (emacs_strerror): Declare.
3632 (MMAP_ALLOCATED_P, mmap_enlarge, syms_of_buffer): Import changes
3635 * fontset.c (Fclear_face_cache): Declare.
3636 (accumulate_font_info): Commented-out (unused).
3637 (face_for_char, Fset_fontset_font, Ffontset_info): Remove unused
3640 * character.h (string_escape_byte8): Declare.
3642 * charset.c (load_charset_map, load_charset_map_from_file): Remove
3644 (Fdefine_charset_internal, Fsplit_char, syms_of_charset)
3645 (Fmap_charset_chars): Doc fix.
3647 * coding.c (Vchar_coding_system_table, Qchar_coding_system):
3649 (Fset_coding_system_priority, Fset_coding_system_priority)
3650 (Fdefine_coding_system_internal): Doc fix.
3652 2002-05-16 Dave Love <fx@gnu.org>
3654 * s/osf5-0.h (C_SWITCH_SYSTEM) [!__GNUC__]: Remove -nointrinsics.
3656 2002-05-16 Kenichi Handa <handa@m17n.org>
3658 * character.c (string_escape_byte8): Make multibyte string with
3661 * charset.c (Fmake_char): Delete unnecessary code.
3663 2002-05-14 Kenichi Handa <handa@m17n.org>
3665 * xfns.c (x_encode_text): Allocate coding.destination here, and
3666 call encode_coding_object with dst_object Qnil.
3668 * buffer.c (Fset_buffer_multibyte): Convert 8-bit bytes to
3669 multibyte form correctly.
3671 * fontset.c (fs_load_font): Check fontp->full_name (not fontname)
3672 against Vfont_encoding_alist.
3674 * coding.c (Fdecode_sjis_char): Fix typo (0x7F->0xFF). Fix the
3675 handling of charset list.
3676 (encode_coding_iso_2022): Setup coding->safe_charsets in advance.
3677 (decode_coding_object): Move point to coding->dst_pos before
3678 calling post-read-conversion function.
3679 (encode_coding_object): Give correct arguments to
3680 pre-write-conversion. Ignore the return value of
3681 pre-write-conversion function. Pay attention to the case that
3682 pre-write-conversion changes the current buffer. If dst_object is
3683 Qt, even if coding->src_bytes is zero, allocate at least one byte
3684 to coding->destination.
3686 * coding.h (JIS_TO_SJIS): Fix typo (j1->s1, j2->s2).
3688 * charset.c (Fmake_char): Make it more backward compatible.
3689 (Fmap_charset_chars): Fix docstring.
3691 2002-05-13 Dave Love <fx@gnu.org>
3693 * coding.c: Doc fixes.
3694 (Fdefine_coding_system_alias): Use names, not symbols, in
3695 coding-system-alist.
3697 2002-05-13 Kenichi Handa <handa@m17n.org>
3699 * fontset.c (free_realized_fontsets): Call Fclear_face_cache instead
3700 of calling free_realized_face.
3702 2002-05-10 Yong Lu <lyongu@asia-infonet.com>
3704 * charset.c (load_charset_map): Fix previous change.
3705 (read_hex): Don't treat SPC as a comment starter.
3706 (decode_char): If CODE_POINT_TO_INDEX retruns -1, always return
3708 (Fdecode_char): Fix typo.
3710 2002-05-10 Kenichi Handa <handa@m17n.org>
3712 * charset.h (struct charset): New member `code_space_mask'.
3714 * coding.c (coding_set_source): Delete the local variable
3716 (encode_coding_charset): Delete the local variable charset.
3717 (Fdefine_coding_system_internal): Likewise.
3718 (Fdefine_coding_system_internal): Setup
3719 attrs[coding_attr_charset_valids] correctly.
3721 * charset.c (CODE_POINT_TO_INDEX): Utilize `code_space_mask'
3722 member to check if CODE is valid or not.
3723 (Fdefine_charset_internal): Initialize `code_space_mask' member.
3724 (encode_char): Before calling CODE_POINT_TO_INDEX, check if CODE
3725 is within the range of charset->min_code and carset->max_code.
3727 2002-05-09 Dave Love <fx@gnu.org>
3729 * syntax.h (syntax_temp) [!__GNUC__]: Declare.
3731 * dispextern.h (generate_ascii_font): Fix return type.
3733 * xfaces.c (generate_ascii_font): Fix arg declaration.
3735 * coding.c (coding_inherit_eol_type)
3736 (Fset_terminal_coding_system_internal)
3737 (Fset_safe_terminal_coding_system_internal): Fix arg declarations.
3739 2002-05-08 Kenichi Handa <handa@m17n.org>
3741 * coding.c (decode_coding_charset, encode_coding_charset): Handle
3742 multiple charsets correctly.
3744 2002-05-07 Kenichi Handa <handa@m17n.org>
3746 * search.c (boyer_moore): Fix handling of mulitbyte character
3749 * xdisp.c (display_mode_element): When the variable `elt' is
3750 changed, update `this' and `lisp_string'.
3752 2002-05-07 Kenichi Handa <handa@m17n.org>
3754 * buffer.c (Fset_buffer_multibyte): Fix 8-bit char handling.
3756 * callproc.c (Fcall_process): Be sure to give the current buffer
3757 to decode_coding_c_string. Update PT and PT_BYTE after the
3760 * charset.c (struct charset_map_entries): New struct.
3761 (load_charset_map): Renamed from parse_charset_map. New args
3762 entries and n_entries. Caller changed.
3763 (load_charset_map_from_file): Renamed from load_charset_map.
3764 Caller changed. New arg control_flag. Call load_charset_map at
3766 (load_charset_map_from_vector): New function.
3767 (Fdefine_charset_internal): Setup charset.compact_codes_p.
3768 (encode_char): If the charset is compact, change a character index
3771 * coding.c (coding_alloc_by_making_gap): Check the case that the
3772 source and destination are the same correctly.
3773 (decode_coding_raw_text): Set coding->consumed_char and
3774 coding->consumed to 0.
3775 (produce_chars): If coding->chars_at_source is nonzero, update
3776 coding->consumed_char and coding->consumed before calling
3778 (Fdefine_coding_system_alias): Register ALIAS in
3779 Vcoding_system_alist.
3780 (syms_of_coding): Define `no-convesion' coding system at the tail.
3782 * fileio.c (Finsert_file_contents): Set coding_system instead of
3783 val. If the current buffer is multibyte, always call
3786 * xfaces.c (try_font_list): Give higher priority to fontset's
3787 family than face's family.
3789 2002-04-18 Kenichi Handa <handa@m17n.org>
3791 * callproc.c (Fcall_process): Be sure to give the current buffer
3792 to decode_coding_c_string.
3794 * xfaces.c (try_font_list): Give a family specified in a fontset
3795 higher priority than a family specified in a face.
3797 2002-04-09 Kenichi Handa <handa@m17n.org>
3799 * fileio.c (Finsert_file_contents): Fix calculation of `inserted'.
3800 Fix arguments to insert_from_buffer.
3802 * xdisp.c (display_mode_element): Fix calculation of `bytepos'.
3804 2002-03-11 Kenichi Handa <handa@m17n.org>
3806 * coding.c (produce_chars): Set the variable `multibytep' correctly.
3807 (decode_coding_gap): Set coding->dst_multibyte correctly.
3809 2002-03-07 Kenichi Handa <handa@m17n.org>
3811 * coding.c (encode_coding_utf_8): Initialize produced_chars to 0.
3812 (decode_coding_utf_16): Fix converting high and low bytes to
3814 (encode_coding_utf_16): Substitute coding->default_char for
3815 non-Unicode characters.
3816 (decode_coding): Don't call record_insert here.
3817 (setup_coding_system): Initialize `surrogate' of
3818 coding->spec.utf_16 to 0.
3819 (EMIT_ONE_BYTE): Fix for multibyte case.
3821 * insdel.c (insert_from_gap): Call record_insert.
3823 2002-03-04 Kenichi Handa <handa@m17n.org>
3825 * casefiddle.c (casify_region): Fix multibyte case.
3827 * character.c (c_string_width): Add return type `int'.
3828 (char_string_with_unification): Arg ADVANCED deleted.
3830 * character.h (CHAR_VALID_P): Don't call CHARACTERP.
3831 (CHAR_STRING): Adjusted for the change of
3832 char_string_with_unification.
3833 (CHAR_STRING_ADVANCE): Make it do-while statement.
3835 * chartab.c (sub_char_table_set_range): Optimized for the case
3836 DEPTH == 3. Add workaround code for a GCC optimization bug.
3838 * charset.c (parse_charset_map): Remove an unused variable.
3840 * coding.c: Delete unused variables.
3842 * fileio.c (Finsert_file_contents): Set coding_system to Qnil
3843 earlier. If inserted is zero and the coding system doesn't
3844 require flushing, don't call decode_coding_gap.
3846 * syntax.h (SET_RAW_SYNTAX_ENTRY): Don't call make_number.
3848 2002-03-01 Kenichi Handa <handa@m17n.org>
3850 The following changes are for using Unicode as an internal
3851 character model, and use UTF-8 format for buffer/string
3854 * .gdbinit (xchartable): Adjusted for the change of char table
3856 (xsubchartable, xcoding, xcharset, xcurbuf): New commands.
3858 * Makefile.in (obj): Add character.o and chartab.o.
3859 (lisp, shortlisp): Remove utf-8.elc:
3860 (*.o): For many files, change dependency on charset.h to
3861 character.h, and add dependency on character.h.
3862 (character.o, chartab.o): New targets.
3864 * abbrev.c, bytecode.c, casefiddle.c, cmds.c, dispnew.c, doc.c,
3865 doprnt.c, dosfns.c, frame.c, marker.c, minibuf.c, msdos.c,
3866 w16select.c, w32bdf.c, w32console.c: Include "character.h" instead
3869 * dired.c, filelock.c: Include "character.h".
3871 * alloc.c: Include "character.h" instead of "charset.h".
3872 (Fmake_char_table): Moved to chartab.c.
3873 (make_sub_char_table): Likewise.
3874 (syms_of_alloc): Remove defsubr for Smake_char_table.
3876 * buffer.c: Include "character.h" instead of "charset.h", don't
3878 (Fset_buffer_multibyte): Adjuted for UTF-8.
3880 * buffer.h: EXFUN Fbuffer_live_p.
3882 * callproc.c: Include "character.h" instead of "charset.h".
3883 (Fcall_process): Big change for the new code-conversion APIs.
3885 * casetab.c: Include "character.h" instead of "charset.h".
3886 (set_canon, set_identity, shuffle): Adjusted for the new
3887 map_char_table spec.
3888 (init_casetab_once): Call CHAR_TABLE_SET instead of directly
3889 accessing the char table structure.
3891 * chartab.c: New file that implements char table.
3893 * category.c: Include "character.h".
3894 (copy_category_entry): New function.
3895 (copy_category_table): Call map_char_table and copy_category_entry.
3896 (Fmake_category_table): Initialize all top-vel slots.
3897 (char_category_set): New function.
3898 (modify_lower_category_set): Deleted.
3899 (Fmodify_category_entry): Call char_table_ref_and_range.
3901 * category.h (CATEGORY_SET): Just call char_category_set.
3903 * ccl.c: Include "character.h".
3904 (Qccl, Qcclp): New variables.
3905 (CCL_WRITE_CHAR): Alway treat the arg CH as a character even if
3907 (CCL_WRITE_MULTIBYTE_CHAR): Deleted.
3908 (CCL_WRITE_STRING, CCL_READ_CHAR): Adjusted for the change of SRC
3910 (ccl_driver): Types of arguments changed. Code adjusted for that.
3911 (Fccl_execute, Fccl_execute_on_string): Adjusted for the change of
3913 (syms_of_ccl): Intern and staticpro Qccl and Qcclp.
3915 * ccl.h (struct ccl_program): Members eol_type and multibyte
3916 deleted. New members src_multibyte, dst_multibyte, consumed, and
3918 (struct ccl_spec): Members decoder and encoder deleted. New
3920 (CODING_SPEC_CCL_PROGRAM): New macro.
3921 (ccl_driver): Prototype updated.
3922 (Qccl, Qcclp, Fccl_program_p): Extern them.
3923 (CHECK_CCL_PROGRAM): New macro.
3925 * character.c, character.h, chartab.c: New files.
3927 * charset.c: Mostly re-written. Character and multibyte sequence
3928 handling codes are moved to character.c.
3930 * charset.h: Mostly re-written. Character and multibyte sequence
3931 handling codes are moved to character.h.
3933 * coding.c, coding.h: Mostly re-written.
3935 * composite.c: Include "character.h" instead of "charset.h".
3936 (CHAR_WIDTH): Moved to character.h.
3937 (HASH_KEY, HASH_VALUE): Deleted.
3939 * composite.h (enum composition_method): Order of enumeration
3942 * data.c: Include "character.h" instead of "charset.h".
3943 (Faref): Call CHAR_TABLE_REF for a char table.
3944 (Faset): Call CHAR_TABLE_SET for a char table.
3946 * dispextern.h (free_realized_face, check_face_attribytes,
3947 generate_ascii_font): Extern them.
3948 (free_realized_multibyte_face): Extern deleted.
3950 * disptab.h (DISP_CHAR_VECTOR): Adjusted for the change of char
3953 * editfns.c: Include "character.h" instead of "charset.h".
3954 (Fchar_to_string): Always call CHAR_STRING.
3956 * emacs.c (main): Call init_charset_once, init_charset,
3957 syms_of_chartab, and syms_of_character.
3959 * fileio.c: Include "character.h" instead of "charset.h".
3960 (Finsert_file_contents): Big change for the new code-conversion
3962 (choose_write_coding_system): Likewise.
3963 (Fwrite_region): Likewise.
3964 (build_annotations_2): Deleted.
3965 (e_write): Big change for the new code-conversion API.
3967 * fns.c: Include "character.h" instead of "charset.h".
3968 (copy_sub_char_table): Moved to chartab.c.
3969 (Fcopy_sequence): Call copy_char_table for a char table.
3970 (concat): Delete codes calling count_multibyte.
3971 (string_char_to_byte): Adjusted for the new multibyte form.
3972 (string_byte_to_char): Likewise.
3973 (internal_equal): Adjusted for the change of char table structure.
3974 (Fchar_table_subtype, Fchar_table_parent, Fset_char_table_parent,
3975 Fchar_table_extra_slot, Fset_char_table_extra_slot,
3976 Fchar_table_range, Fset_char_table_range, Fset_char_table_default,
3977 char_table_translate, optimize_sub_char_table,
3978 Foptimize_char_table, map_char_table, Fmap_char_table): Moved to
3980 (char_table_ref_and_index): Deleted.
3981 (HASH_KEY, HASH_VALUE): Moved to lisp.h.
3982 (Fmd5): Call preferred_coding_system instead of accessing
3983 Vcoding_category_list. Adjusted for the new code-conversion API.
3984 (syms_of_fns): Defsubr for char table related functions moved to
3987 * fontset.c: Mostly re-written.
3989 * fontset.h (struct font_info): Type of the member encoding_type
3991 (enum FONT_SPEC_INDEX): New enum.
3992 (fontset_font_pattern, fs_load_font): Prototype updated.
3993 (FS_LOAD_FONT): Adjusted for the change of fs_load_font.
3995 * indent.c: Include "character.h" instead of "charset.h".
3996 (MULTIBYTE_BYTES_WIDTH): Call CHAR_WIDTH instead of
3999 * insdel.c: Include "character.h" instead of "charset.h".
4000 (copy_text): Don't refer to Vnonascii_translation_table.
4001 (insert_from_gap): New function.
4003 * keyboard.c: Include "character.h" instead of "charset.h".
4004 (command_loop_1): Never call direct_output_forward_char before
4005 a non-ASCII character.
4006 (read_char): If Vkeyboard_translate_table is a char table, always
4007 translated a character.
4009 * keymap.c: Include "character.h".
4010 (store_in_keymap): Handle the case that IDX is a cons.
4011 (Fdefine_key): Handle the case that KEY is a cons and the car part
4012 is also a cons (range).
4013 (push_key_description): Adjusted for the new character code.
4014 (describe_vector): Call describe_char_table for a char table.
4015 (describe_char_table): New function.
4017 * keymap.h (describe_char_table): Extern it.
4019 * lisp.h (enum pvec_type): New member PVEC_SUB_CHAR_TABLE.
4020 (XSUB_CHAR_TABLE, XSETSUB_CHAR_TABLE): New macros.
4021 (CHAR_TABLE_ORDINARY_SLOTS, CHAR_TABLE_SINGLE_BYTE_SLOTS,
4022 SUB_CHAR_TABLE_ORDINARY_SLOTS, SUB_CHAR_TABLE_STANDARD_SLOTS):
4024 (CHAR_TABLE_REF, CHAR_TABLE_SET): Adjusted for the new char table
4026 (CHAR_TABLE_TRANSLATE): Just call char_table_translate.
4027 (CHARTAB_SIZE_BITS_0, CHARTAB_SIZE_BITS_1, CHARTAB_SIZE_BITS_2,
4028 CHARTAB_SIZE_BITS_3): New macros.
4029 (chartab_size): Extern it.
4030 (struct Lisp_Char_Table): Re-designed.
4031 (struct Lisp_Sub_Char_Table): New structure.
4032 (HASH_KEY, HASH_VALUE): Moved from fns.c.
4033 (CHARACTERBITS): Defined as 22.
4034 (GLYPH_MASK_FACE, GLYPH_MASK_CHAR): Adjusted for the above change.
4035 (SUB_CHAR_TABLE_P): Check PVEC_CHAR_TABLE.
4036 (GC_SUB_CHAR_TABLE_P): New macro.
4037 (Fencode_coding_string, Fdecode_coding_string): EXFUN Updated.
4038 (code_convert_string_norecord): Extern deleted.
4039 (init_character_once, syms_of_character, init_charset,
4040 syms_of_composite, Qeq, Fmakehash, insert_from_gap): Extern them.
4042 * lread.c: Include "character.h".
4043 (read_multibyte): New arg NBYTES.
4044 (read_escape): The meaning of returned *BYTEREP changed.
4045 (to_multibyte): Deleted.
4046 (read1): Adjuted the handling of char table and string.
4048 * print.c: Include "character.h" instead of "charset.h".
4049 (print_string): Convert 8-bit raw bytes to octal form by
4050 string_escape_byte8.
4051 (print_object): Adjusted for the new multibyte form. Print 8-bit
4052 raw bytes always in octal form. Handle sub char table correctly.
4054 * process.c: Include "character.h" instead of "charset.h".
4055 (read_process_output): Adjusted for the new code-conversion API.
4056 (send_process): Likewise.
4058 * puresize.h (BASE_PURESIZE): Increased.
4060 * regex.c: Include "character.h" instead of "charset.h".
4061 (BYTE8_TO_CHAR, CHAR_BYTE8_P) [not emacs]: New dummy macros.
4062 (regex_compile): Accept a range whose starting and ending
4063 character have different leading bytes.
4064 (analyse_first): Adjusted for the above change.
4066 * search.c: Include "character.h" instead of "charset.h".
4067 (search_buffer, boyer_moore): Adjusted for the new multibyte form.
4068 (Freplace_match): Adjusted for the change of
4069 multibyte_char_to_unibyte.
4071 * syntax.c: Include "character.h" instead of "charset.h".
4072 (syntax_parent_lookup): Deleted.
4073 (Fmodify_syntax_entry): Accept a cons as CHAR.
4074 (skip_chars): Adjusted for the new multibyte form.
4075 (init_syntax_once): Call char_table_set_range instead of directly
4076 accessing the structure of a char table.
4078 * syntax.h (SET_RAW_SYNTAX_ENTRY): Call CHAR_TABLE_SET.
4079 (SYNTAX_ENTRY_FOLLOW_PARENT): Macro deleted.
4080 (SET_RAW_SYNTAX_ENTRY_RANGE): New macro.
4081 (SYNTAX_ENTRY_INT): Call CHAR_TABLE_REF.
4083 * term.c: Include "buffer.h" and "character.h".
4084 (encode_terminal_code): Adjusted for the new code-conversion API.
4085 (write_glyphs): Likewise.
4086 (produce_glyphs): Call CHAR_WIDTH instead of CHARSET_WIDTH.
4088 * w32term.c (x_new_font): Adjusted for the change of FS_LOAD_FONT.
4090 * xdisp.c: Include "character.h".
4091 (get_next_display_element): Adjusted for the new multibyte form.
4092 (disp_char_vector): Adjusted for the new char table structure.
4093 (decode_mode_spec_coding): Adjusted for the new structure of
4095 (decode_mode_spec): Adjusted for the new code-conversion API.
4097 * xfaces.c: Include "character.h" instead of "charset.h".
4098 (load_face_font): Adjusted for the change of choose_face_font and
4100 (generate_ascii_font): New function.
4101 (set_lface_from_font_name): Adjusted for the change of
4103 (set_font_frame_param): Adjusted for the change of
4105 (free_realized_face): Make it public.
4106 (free_realized_faces_for_fontset): Renamed from
4107 free_realized_multibyte_face. Free also faces realized for ASCII.
4108 (choose_face_font): Argments changed. Adjusted for the change of
4109 fontset_font_pattern and FS_LOAD_FONT.
4111 * xfns.c: Include "character.h".
4112 (x_encode_text): Adjusted for the new code-conversion API.
4114 * xselect.c: Don't include "charset.h".
4115 (selection_data_to_lisp_data): Adjusted for the new code
4118 * xterm.c: Include "character.h".
4119 (x_encode_char): New argument CHARSET. Caller changed.
4120 (x_get_char_face_and_encoding): Call ENCODE_CHAR instead of
4122 (x_get_glyph_face_and_encoding): Likewise.
4123 (x_produce_glyphs): Don't check Vnonascii_translation_table Call
4124 CHAR_WIDTH instead of CHARSET_WIDTH.
4125 (XTread_socket): Adjusted for the new code-conversion API.
4126 (x_new_font): Adjusted for the change of FS_LOAD_FONT.
4127 (x_load_font): Adjusted for the change of struct font.
4130 ;; coding: iso-2022-7bit
4133 Copyright (C) 2002 Free Software Foundation, Inc.
4134 Copying and distribution of this file, with or without modification,
4135 are permitted provided the copyright notice and this notice are preserved.
4137 ;;; arch-tag: 1bff38bd-2030-46ae-9d18-f15e6006b665