1 2007-05-21 Kenichi Handa <handa@m17n.org>
3 * syntax.c (skip_syntaxes): Synch with the trunk.
5 2007-05-14 Kenichi Handa <handa@m17n.org>
7 * character.c (Funibyte_string): New function.
8 (syms_of_character): Defsubr it.
10 2007-05-01 Jason Rumney <jasonr@gnu.org>
12 * w32term.c [USE_FONT_BACKEND]:
13 (x_get_font_repertory, note_mouse_movement, x_set_mouse_face_gc):
14 (x_set_glyph_string_clipping, x_set_glyph_string_clipping_exactly):
15 (x_draw_glyph_string, x_draw_glyph_string_foreground):
16 (x_draw_composite_glyph_string_foreground, x_new_fontset2):
17 (x_free_frame_resources): Sync with xterm.c.
19 2007-04-29 Andreas Schwab <schwab@suse.de>
21 * lread.c (read1): Use CHAR_TABLE_STANDARD_SLOTS to validate
24 2007-04-26 Kenichi Handa <handa@m17n.org>
26 * font.c (check_otf_features): Define it regardless of
29 2007-04-25 Kenichi Handa <handa@m17n.org>
31 * ftfont.c (ftfont_driver): Delete font_otf_gsub and
32 font_otf_gpos, add font_drive_otf.
34 * fontset.c (fontset_find_font): Pay attention to font size
36 (reorder_font_vector): Check contents of font_def.
38 * font.c (struct otf_list): Delete it.
39 (otf_list): Make it a lisp variable..
40 (otf_open): Use lispy otf_list.
41 (generate_otf_features): Renamed from parse_gsub_gpos_spec.
42 (check_otf_features): New function.
43 (font_otf_DeviceTable, font_otf_ValueRecord, font_otf_Anchor): New
45 (font_drive_otf): New function merging font_otf_gsub and
47 (font_open_for_lface): New arg spec. Change argument order.
48 (font_load_for_face): Adjusted for the change of
50 (Ffont_drive_otf): New function merging Ffont_otf_gsub and
52 (syms_of_font): Staticpro otf_list. Delete defsubr of
53 Sfont_otf_gsub and Sfont_otf_gpos. Defsubr Sfont_drive_otf.
55 * xfaces.c (set_font_frame_param): Adjusted for the change of
58 * font.h (font_open_for_lface): Adjust prototype.
59 (struct font_driver): Delete members otf_gsub and otf_gpos, add
61 (font_otf_gsub, font_otf_gpos): Delete externs.
62 (font_drive_otf): Extern it.
64 2007-04-24 Kenichi Handa <handa@m17n.org>
66 * font.c (font_at): If the window W is not on a window system,
69 * coding.c (produce_chars): Don't call insert_from_gap if no
70 characters to produce.
71 (encode_coding): Likewise.
73 2007-04-17 Kenichi Handa <handa@m17n.org>
75 * fontset.c (free_realized_fontsets): Avoid unnecessary call of
78 * xfaces.c (face_for_font): Check also face->font==font->font.font.
80 2007-04-16 Miles Bader <miles@gnu.org>
82 * emacs.c (main): Change default value of `enable_font_backend' to 1.
83 Parse "--disable-font-backend" option.
84 (standard_args): Add "--disable-font-backend" option.
86 2007-04-13 Kenichi Handa <handa@m17n.org>
88 * fontset.c (fontset_find_font): New function.
89 (fontset_font): Use fontset_find_font.
90 (make_fontset_for_ascii_face): Don't set face ID in rfont_def.
91 Register the specified font for all Latin characters.
92 (new_fontset_from_font): Register the specified font for all Latin
94 (dump_fontset): For a realized fontset, include the base fontset
95 name in the returned vector.
97 2007-04-11 Kenichi Handa <handa@m17n.org>
99 * character.h (CHAR_STRING): Cast C to unsigned on calling
102 * character.c (char_string): Type of arg C changed to unsigned.
103 Signal an error if C is an invalid character code.
105 * editfns.c (general_insert_function): Use CHARACTERP, not INTEGERP.
106 (Fchar_to_string): Likewise.
108 2007-03-23 Kenichi Handa <handa@m17n.org>
110 * character.h (MIN_MULTIBYTE_LEADING_CODE)
111 (MAX_MULTIBYTE_LEADING_CODE): New macros.
113 * regex.c (analyse_first): Fix for multibyte characters in "case
114 charset:" and "case categoryspec:".
116 2007-03-04 Andreas Schwab <schwab@suse.de>
118 * Makefile.in (LIBES): Move standard libraries to the end.
120 2007-02-27 Kenichi Handa <handa@m17n.org>
122 * process.c: Cancel the change done by sync with HEAD.
124 2007-02-23 Kenichi Handa <handa@m17n.org>
126 * alloc.c (Fgarbage_collect): If nextb->text->inhibit_shrinking is
127 nonzero, don't shrink the buffer nextb.
129 * buffer.h (struct buffer_text): New member inhibit_shrinking.
131 * coding.c (coding_alloc_by_making_gap): New arg offset.
132 (alloc_destination): Call coding_alloc_by_making_gap with the arg
134 (decode_coding_iso_2022): Update coding->safe_charsets.
135 (decode_coding_gap): Temporarily set
136 current_buffer->text->inhibit_shrinking to 1.
138 2007-02-20 Kenichi Handa <handa@m17n.org>
140 * xterm.c (x_draw_composite_glyph_string_foreground): Fix
141 indexing into elements of s->cmp and s->char2b.
143 2007-02-16 Juanma Barranquero <lekktu@gmail.com>
145 * regex.c (RE_STRING_CHAR_AND_LENGTH) [! emacs]: Add missing arg `len'.
147 2007-02-16 Kenichi Handa <handa@m17n.org>
149 * regex.c (GET_CHAR_BEFORE_2, GET_CHAR_AFTER): Check the variable
150 target_multibyte instead of multibyte.
151 (re_match_2_internal): Call bcmp_translate with target_multibyte.
152 (bcmp_translate): Change the argument name from multibyte to
155 2007-02-15 Kenichi Handa <handa@m17n.org>
157 These changes are to compile a regexp into a pattern that can be
158 used both for multibyte and unibyte targets.
160 * Makefile.in (search.o): Depend on charset.h.
162 * character.c (multibyte_char_to_unibyte_safe): New function.
164 * search.c: Include "charset.h".
165 (compile_pattern_1): Delete argument multibyte. Don't set
166 cp->buf.target_multibyte here. Set cp->buf.charset_unibyte.
167 (compile_pattern): Don't compare cp->buf.target_multibyte.
168 Compare cp->buf.charset_unibyte.
169 (compile_pattern): Set cp->buf.target_multibyte.
171 * lisp.h (multibyte_char_to_unibyte_safe): Extern it.
173 * regex.h (struct re_pattern_buffer): New member charset_unibyte.
175 * regex.c (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
176 multibyte. Callers changed.
177 (RE_CHAR_TO_MULTIBYTE, RE_CHAR_TO_UNIBYTE): New macros.
178 (MAKE_CHAR_MULTIBYTE, MAKE_CHAR_UNIBYTE): Deleted. Callers
179 changed to use RE_CHAR_TO_MULTIBYTE and RE_CHAR_TO_UNIBYTE
181 (SETUP_ASCII_RANGE, SETUP_UNIBYTE_RANGE): New macros.
182 (SETUP_MULTIBYTE_RANGE): Generate a more compact range_table.
183 (regex_compile): Make the compiled pattern usable both for
184 multibyte and unibyte targets.
185 (analyse_first): Make the fastmap usable both for multibyte and
187 (TRANSLATE_VIA_MULTIBYTE): Deleted.
188 (re_match_2_internal): Pay attention to the case that the
189 multibyteness of bufp and target may be different.
191 2007-02-14 Kenichi Handa <handa@m17n.org>
193 * xdisp.c (x_produce_glyphs): When a font is not found, make the
194 empty box occupy at least one column width.
196 2007-01-30 Miles Bader <miles@gnu.org>
198 * Makefile.in: Remove redundant HAVE_XFT clause.
200 2006-12-20 Kenichi Handa <handa@m17n.org>
202 * xrdb.c (x_load_resources): Setup the default fontSet X reource.
204 2006-12-15 Kenichi Handa <handa@m17n.org>
206 * regex.c (regex_compile): Synch with HEAD.
208 2006-12-12 Kenichi Handa <handa@m17n.org>
210 * fontset.c (Finternal_char_font): Fix previous change.
212 2006-12-07 Kenichi Handa <handa@m17n.org>
214 * fontset.c (Finternal_char_font): Fix for the case of POSITION
217 2006-12-06 Kenichi Handa <handa@m17n.org>
219 * xftfont.c (xftfont_open): Call FcConfigSubstitute.
221 2006-12-05 Kenichi Handa <handa@m17n.org>
223 * xftfont.c (xftfont_open): Don't enable antialias explicitly.
225 2006-11-30 Kenichi Handa <handa@m17n.org>
227 * search.c (simple_search): Fix previous change.
229 2006-11-29 Kenichi Handa <handa@m17n.org>
231 * xftfont.c (ftfont_font_format): Extern declaration.
233 * frame.c (x_set_font): Fix the second arg to fs_query_fontset.
235 * xfont.c (xfont_driver): Initialize ftfont_driver.type by 0.
236 (xfont_list): Don't directly use Lisp_Object as an operand of &&.
238 * ftfont.c (ftfont_driver): Initialize ftfont_driver.type by 0.
239 (ftfont_font_format): Fix previous change.
241 * font.h (Ffont_xlfd_name): EXFUN it.
243 * font.c (font_parse_xlfd): Fix the array size of `f'.
244 (register_font_driver): Use EQ to compare driver->type.
246 * xfns.c (xic_create_xfontset2) [USE_FONT_BACKEND]: New function.
247 (create_frame_xic) [USE_FONT_BACKEND]: Call xic_create_xfontset2.
248 (xic_set_xfontset) [USE_FONT_BACKEND]: Likewise.
250 2006-11-27 Kenichi Handa <handa@m17n.org>
252 * ftfont.c (ftfont_pattern_entity): Check if FC_FONTFORMAT is
254 (ftfont_list_generic_family, ftfont_list, ftfont_font_format):
257 2006-11-24 Kenichi Handa <handa@m17n.org>
259 * xfont.c (xfont_open): Set font->format.
261 * xftfont.c (xftfont_open): Set font->format.
263 * ftfont.c (ftfont_pattern_entity): Add fontformat in a pattern.
264 (ftfont_list): Include FC_FONTFORMAT in FcObject.
265 (ftfont_open): Set font->format.
266 (ftfont_font_format): New function.
268 * font.h (struct font): New memeber format.
270 * font.c (Qopentype): New variable.
271 (syms_of_font): Defsym it.
272 (Fquery_font): Change the format of the last element of the return
275 2006-11-22 Kenichi Handa <handa@m17n.org>
277 * search.c (simple_search): Fix sync with HEAD.
279 2006-11-17 Kenichi Handa <handa@m17n.org>
281 * xfns.c (xic_create_xfontset): Try the default fontset name as a
284 2006-11-08 Kenichi Handa <handa@m17n.org>
286 * coding.c (detect_coding_charset): Fix detection of multi-byte
289 2006-11-07 Bob Halley <halley@play-bow.org> (tiny change)
291 * ccl.c (ccl_driver): If DST is NULL, set ccl->produced to 0.
293 2006-10-31 Kenichi Handa <handa@m17n.org>
295 * xdisp.c (get_next_display_element): Set it->face_id for the
296 first component of a composition.
297 (x_produce_glyphs): Check if the font is changed or not for
300 2006-10-31 Kenichi Handa <handa@m17n.org>
302 (get_next_display_element): Set it->face_id for the
303 first component of a composition.
304 (x_produce_glyphs): Check if the font is changed or not for
307 2006-10-30 Kenichi Handa <handa@m17n.org>
309 * fontset.c (Qlatin): New variable.
310 (syms_of_fontset): Define it as a lisp symbol.
311 (Fset_fontset_font): If TARGET is `latin', use FONT_SPEC for
314 2006-10-27 Kenichi Handa <handa@m17n.org>
316 * font.c (font_unparse_fcname): Pay attention to the case that
317 some of font property is a null string.
319 2006-10-26 Kenichi Handa <handa@m17n.org>
321 * term.c: Include "composite.h".
322 (encode_terminal_code): Output all components of composition.
323 Check the size of encode_terminal_src.
324 (produce_glyphs): For compostion, call produce_composite_glyph.
325 (append_composite_glyph, produce_composite_glyph): New functions.
327 * xdisp.c (x_produce_glyphs): In handling composition, if a font
328 is not found, get font_info from the current ascii face.
330 2006-10-23 Kenichi Handa <handa@m17n.org>
332 * fileio.c (Finsert_file_contents): On replacing, temporarily bind
333 buffer-file-name to Qnil before calling insert_from_buffer.
335 * font.c (font_unparse_fcname): Pay attention to the case that
336 foundry is a null string.
338 2006-10-17 Kenichi Handa <handa@m17n.org>
340 * ftfont.c (ftfont_list): Allow registry "unicode-sip".
342 * font.c (Qunicode_sip): New variable.
343 (syms_of_font): Declare it as a Lisp symbol.
345 * font.h (Qunicode_sip): Extern it.
347 2006-10-16 Kenichi Handa <handa@m17n.org>
349 * composite.c (get_composition_id): Pay attention to TAB
352 * xterm.c (x_draw_composite_glyph_string_foreground): Don't draw
353 TAB. Adjusted for the change of s->char2b which always points to
354 the first elememnt of allocated memory.
356 * xftfont.c (xftfont_text_extents): Fix calculation of descent
359 * xdisp.c (handle_composition_prop): Set it->c to the first
361 (fill_composite_glyph_string): Argument changed.
362 (BUILD_COMPOSITE_GLYPH_STRING): Adjusted for the above change.
363 (x_produce_glyphs): Fix handling of left/right padding.
365 2006-10-04 Kenichi Handa <handa@m17n.org>
367 * regex.c (analyse_first): Cancel the change for synching with
370 2006-08-28 Kenichi Handa <handa@m17n.org>
372 * coding.c (detect_coding_system): Fix for handling off
373 inhibit_iso_escape_detection. Fix for the case that no coding
374 system is defined for a specific coding category.
376 2006-08-21 Kenichi Handa <handa@m17n.org>
378 * font.c (font_matching_entity): Dolete unused local var.
380 * xftfont.c (xftfont_open): Call XftDefaultSubstitute before
383 * fileio.c (Finsert_file_contents): On recovering a file, assume
385 (choose_write_coding_system): On auto-saving a file, force
388 * coding.c (setup_coding_system): Fix setting of
389 coding->common_flags based on eol_type.
390 (coding_inherit_eol_type): If PARENT is not nil, be sure to
393 2006-08-04 Kenichi Handa <handa@m17n.org>
395 * alloc.c (NSTATICS): Increased to 0x600.
397 2006-08-01 Kenichi Handa <handa@m17n.org>
399 * ftfont.c (ftfont_driver): Set ftfont_driver.match to
401 (ftfont_list): Don't check :name property.
402 (ftfont_match): New function.
403 (ftfont_pattern_entity): If the pattern doesn't contain
404 FC_SPACING, don't assuce FC_MONO.
406 * font.h (struct font_driver): New member `match'.
407 (font_update_drivers): Prototype adjusted.
409 * font.c (font_parse_fcname): Don't change :name property of FONT.
410 (font_parse_name): Likewise.
411 (LGSTRING_HEADER_SIZE, LGSTRING_GLYPH_SIZE, check_gstring): Define
412 them unconditionally.
413 (font_matching_entity): New function.
414 (font_open_by_name): Try font_matching_entity if exact match is
416 (font_update_drivers): Delete the arg FONT. Return a list of
417 actually used backends. Don't free faces, font caches here.
418 Don't store data in frame parameters. Don't call x_set_font.
419 (Ffont_spec): Store :name property as is.
420 (Ffont_get): Check HAVE_LIBOTF before calling font_otf_capability.
421 (Ffont_otf_gsub): Call font->driver->otf_gsub instead of
423 (Ffont_otf_gpos): Call font->driver->otf_gpos instead of
425 (Ffont_otf_alternates): Check if the driver has otf_gsub function.
426 Call font->driver->otf_gsub instead of font_otf_gsub.
428 * frame.c (x_set_font_backend): Do more works that were done in
429 font_update_drivers before.
431 * xfont.c (xfont_match): New function.
432 (xfont_driver): Set xfont_driver.match to xfont_match.
433 (xfont_draw): Set font in GC if necessary.
435 * ftxfont.c (ftxfont_match): New function.
436 (syms_of_ftxfont): Set ftxfont_driver.match to ftxfont_match.
438 * xftfont.c (xftfont_match): New function.
439 (syms_of_xftfont): Set xftfont_driver.match to xftfont_match.
441 2006-07-28 Kenichi Handa <handa@m17n.org>
443 * font.h (struct font): New member scalable.
444 (struct font_driver): New arg ALTERANTE_SUBST to otf_gsub.
445 (font_otf_gsub): Prototype adjusted.
447 * font.c (font_otf_capability): Fix handling of the default
449 (parse_gsub_gpos_spec): Type changed to void. New arg nbytes.
450 Check the contents of SPEC.
451 (LGSTRING_HEADER_SIZE, LGSTRING_GLYPH_SIZE): New macros.
452 (check_gstring): New function.
453 (REPLACEMENT_CHARACTER): New macro.
454 (font_otf_gsub): New arg alternate_subst. Be sure to set all
455 glyph codes of GSTRING.
456 (font_otf_gpos): Be sure to set all glyph codes of GSTRING.
457 (font_prepare_composition): Set cmp->glyph_len.
458 (font_open_entity): Set font->scalable.
459 (Ffont_get): Handle :otf property.
460 (Ffont_otf_gsub, Ffont_otf_gpos, Ffont_otf_alternates): New
462 (Fquery_font): Use font->font.full_name.
463 (syms_of_font): Defsubr Sfont_otf_gsub, Sfont_otf_gpos, and
464 Sfont_otf_alternates.
466 * ftfont.c (ftfont_open): Set font->font.full_name and
467 font->font.name properly. Fix calculation of font->font.height
470 * ftxfont.c (ftxfont_create_gcs): New function.
471 (ftxfont_draw_bitmap): Fix arg to ftfont_driver.get_bitmap.
472 (ftxfont_draw_backgrond): Fix filling region.
473 (ftxfont_default_fid): New function.
474 (ftxfont_open): Set xfotn->fid to the return value of
476 (ftxfont_prepare_face): Use ftxfont_create_gcs to create GCs.
477 (ftxfont_done_face): Free only GCs that are created by
479 (ftxfont_draw): If face->gc != s->gc, create proper GCs.
481 * xterm.c (x_set_glyph_string_clipping_exactly) [USE_FONT_BACKEND]:
482 Clip to src->width, etc (not src->clip_XXX).
484 * xfns.c (x_create_tip_frame) [USE_FONT_BACKEND]: Handle
485 FontBackend frame parameter.
487 2006-07-26 Kenichi Handa <handa@m17n.org>
489 * font.h (struct font_driver_list): New member `on'.
490 (Fclear_font_cache): EXFUN it.
491 (font_update_drivers): Extern it.
493 * font.c (font_unparse_fcname): Fix typo (swidth->width).
494 (font_list_entities): Check driver_list->on.
495 (register_font_driver): Initalize `on' member to 0.
496 (font_update_drivers): New function.
497 (Fclear_font_cache): Check driver_list->on.
499 * frame.h (Qfont_backend): Extern it.
500 (x_set_font_backend): Extern it.
502 * frame.c (Qfont_backend): New variable.
503 (frame_parms): New element for font-backend.
504 (x_set_font_backend): New function.
506 * xfns.c (Fx_create_frame) [USE_FONT_BACKEND]: Handle
507 FontBackend frame parameter.
508 (x_frame_parm_handlers) [USE_FONT_BACKEND]: New element
511 * xfont.c (xfont_list): Don't try listing by :name property if the
512 name is not for XLFD.
514 2006-07-24 Kenichi Handa <handa@m17n.org>
516 * font.h (LGLYPH_FROM, LGLYPH_TO, LGLYPH_SET_FROM)
517 (LGLYPH_SET_TO): New macros.
518 (LGLYPH_XOFF, LGLYPH_YOFF, LGLYPH_WADJUST): Check if adjustment
519 element of G is vector or not.
520 (font_at): Extern it.
522 * font.c: Include window.h.
523 (font_lispy_object): New function.
524 (font_prepare_composition): Check LGLYPH_FORM (g) to detect the
526 (font_close_object): Fix getting (struct font *).
527 (font_at): New function.
528 (Ffont_get): If FONT is a font-object, get entity from it.
529 (Ffont_make_gstring): Initialize elements of glyphs with nil.
530 (Ffont_fill_gstring): Use macro LGSTRING_XXX and LGLYPH_XXX. Fix
532 (Ffont_at): New function.
533 (syms_of_font): Defsubr Sfont_at.
535 * xdisp.c (it_props): Move the entry for Qauto_composed to just
536 before the entry for Qcompostion.
537 (handle_auto_composed_prop): Call auto-composition-function with 4
539 (handle_composition_prop) [USE_FONT_BACKEND]: Set it->face_id from
541 (fill_composite_glyph_string) [USE_FONT_BACKEND]: Check
542 LGLYPH_FORM (g) to detect the end of valid glyph.
543 (x_produce_glyphs) [USE_FONT_BACKEND]: Don't update it->face_id if
544 we are composing with gstring.
546 * xterm.c (x_draw_composite_glyph_string_foreground) [USE_FONT_BACKEND]:
547 Check if adjustment is vector or not.
549 * Makefile.in (font.o): Make it depends on window.h.
551 2006-07-24 Kenichi Handa <handa@m17n.org>
553 * xterm.c (x_draw_composite_glyph_string_foreground): Check if
554 adjustment is vector or not.
556 2006-07-20 Kenichi Handa <handa@m17n.org>
558 * casefiddle.c (casify_object): Sync with HEAD.
560 2006-07-18 Miles Bader <miles@gnu.org>
562 * character.h (CHECK_CHARACTER): Redefine in terms of CHECK_TYPE.
564 2006-07-14 Kenichi Handa <handa@m17n.org>
566 * font.h (LGLYPH_XOFF, LGLYPH_YOFF, LGLYPH_WIDTH, LGLYPH_WADJUST)
567 (LGLYPH_SET_WIDTH): Adjusted for the change of LGLYPH format.
568 (LGLYPH_ADJUSTMENT, LGLYPH_SET_ADJUSTMENT): New macros.
570 * font.c (font_merge_old_spec): Treat '*' in foundry as a wild
572 (DEVICE_DELTA): Fix typo.
573 (font_otf_gpos): Adjusted for the change of LGLYPH format.
574 (font_prepare_composition): Likewise.
576 * xterm.c (x_draw_composite_glyph_string_foreground): Adjusted for
577 the change of LGLYPH format.
579 2006-07-07 Kenichi Handa <handa@m17n.org>
581 * ftfont.c (ftfont_list): Fix typo.
582 (ftfont_build_basic_charsets): Don't include letters with
585 2006-07-09 Jan Dj
\e,Ad
\e(Brv <jan.h.d@swipnet.se>
587 * xfaces.c (realize_non_ascii_face): Set face->extra to NULL.
589 * xftfont.c (xftfont_done_face): Call XftDrawDestroy only if
590 xftface_info is non-NULL.
592 2006-07-07 Kenichi Handa <handa@m17n.org>
594 * ftfont.c (ftfont_list): Fix typo.
595 (ftfont_build_basic_charsets): Don't include letters with
598 2006-07-05 Jan Dj
\e,Ad
\e(Brv <jan.h.d@swipnet.se>
600 * ftfont.c (ftfont_list): Move misplaced #endif
602 2006-07-05 Kenichi Handa <handa@m17n.org>
604 * ftfont.c (ftfont_list): Pay attention to the case that
605 FC_CAPABILITY is not defined.
607 2006-07-03 Kenichi Handa <handa@m17n.org>
609 * xftfont.c (xftfont_open): Set charset related members to -1.
611 * ftfont.c (ftfont_list): Handle QCotf property. Handling of
613 (ftfont_open): Set charset related members to -1.
615 * fontset.c (Votf_script_alist): New variable.
616 (syms_of_fontset): Initialize it.
617 (fontset_font): Delete unused variable.
619 * fontset.h (Votf_script_alist): Extern it.
621 * font.c (font_find_for_lface): Code optimized.
623 * font.h (font_close_object, font_merge_old_spec): Extern them.
625 2006-06-28 Kenichi Handa <handa@m17n.org>
627 * font.c (QCscalable, Qc, Qm, Qp, Qd): New variables.
628 (syms_of_font): Initialize them.
629 (font_pixel_size): Allow float value in dpi.
630 (font_prop_validate_type): Deleted.
631 (font_prop_validate_symbol, font_prop_validate_style): Argument
632 changed. Caller changed.
633 (font_prop_validate_non_neg): Renamed from
634 font_prop_validate_size.
635 (font_prop_validate_extra): Deleted.
636 (font_prop_validate_spacing): New function.
637 (font_property_table): Add elements for all known properties.
638 (get_font_prop_index): Renamed from check_font_prop_name. New
639 argument FROM. Caller changed.
640 (font_prop_validate): Validate all known properties.
641 (font_put_extra): Argument force deleted. Caller changed.
642 (font_expand_wildcards): Make it static. Fix the way of shrinking
644 (font_parse_xlfd): Arguemnt merge deleted. Fix handling of RESX,
645 RESY, SPACING, and AVGWIDTH. Don't validate property values here.
647 (font_unparse_xlfd): Handle dpi, spacing, and scalable properties.
648 (font_parse_fcname): Arguemnt merge deleted. Fix parsing of point
649 size. Don't validate properties values here. Caller changed.
650 (font_unparse_fcname): Handle dpi, spacing, and scalable
652 (font_open_by_name): Delete unused variable.
653 (Ffont_spec): Likewise. Validate property values.
654 (Ffont_match_p): New function.
656 * font.h (QCscalable): Extern it.
657 (font_parse_xlfd, font_parse_fcname): Prototype adjusted.
659 * ftfont.c (ftfont_list): Handle properties dpi, spacing, and
662 * xfont.c (xfont_query_font): Adjusted for the change of
664 (xfont_list_pattern): New function.
665 (xfont_list): Use xfont_list_pattern.
667 * xftfont.c (xftfont_prepare_face): Cancel previous change.
668 (xftfont_done_face): Likewise.
670 2006-06-26 Kenichi Handa <handa@m17n.org>
672 * font.h (Flist_fonts): EXFUN it.
674 2006-06-25 Jason Rumney <jasonr@gnu.org>
676 * w32term.c (w32_initialize): Add back smoothing_type and
677 smoothing_enabled definitions.
679 2006-06-23 Kenichi Handa <handa@m17n.org>
681 * xterm.c (x_draw_glyph_string) [USE_FONT_BACKEND]: Check
682 s->face->font on determining underline position.
684 2006-06-21 Kenichi Handa <handa@m17n.org>
686 * font.c (font_parse_xlfd): Fix generating of CHARSET_REGISTRY field.
687 (font_has_char): Accept font-object too.
688 (font_find_for_lface): Try at first with a size specified in face.
690 * xftfont.c (xftfont_prepare_face): Make non-ascii face share
691 face->extra with ascii face.
692 (xftfont_done_face): Don't free face->extra of non-ascii face.
694 2006-06-20 Kenichi Handa <handa@m17n.org>
696 * frame.c (x_set_font) [USE_FONT_BACKEND]: Fix argument to
699 2006-06-19 Kenichi Handa <handa@m17n.org>
701 * font.h (QCspacing, QCdpi): Extern them.
702 (enum font_spacing): New enum.
703 (FONT_PIXEL_SIZE_QUANTUM): New macro.
705 * font.c (POINT_TO_PIXEL): Don't divice POINT by 10.
706 (QCspacing, QCdpi): New variables.
707 (syms_of_font): Initialize them.
708 (font_pixel_size): New function.
709 (font_put_extra): New function.
710 (font_parse_xlfd): Fix handling of font size. Add QCdpi property
712 (font_parse_fcname): Handle enumenrated values (e.g. bold). Fix
713 handling font size. Add QCname property that contains only
715 (font_score): Change argument. Caller changed. Pay attention to
716 FONT_PIXEL_SIZE_QUANTUM.
717 (font_sort_entites): Fix handling of font size.
718 (font_list_entities): Likewise.
719 (font_find_for_lface): Likewise.
720 (font_open_for_lface): Likewise.
721 (font_open_by_name): Likewise.
722 (Ffont_spec): Add QCname property that contains only unknown
725 * ftfont.c (ftfont_list): Use assq_no_quit, not Fassq. Don't
726 include weight in listing pattern, instead check weight of each
727 listed font. Don't include scalable in pattern. Pay attention to
728 FONT_PIXEL_SIZE_QUANTUM.
730 2006-06-19 Kenichi Handa <handa@m17n.org>
732 * lread.c (read_escape): Fix the code synched with HEAD.
734 * font.c (font_parse_fcname): Fix parsing of point-size.
735 (font_unparse_fcname): Produce symbolic names for style
737 (font_list_entities): Handle float size correctly.
738 (font_open_by_name): Prefer `normal' property values if the name
739 doesn't specify them.
741 * fontset.c (Finternal_char_font): Use font_get_name, not
744 * ftfont.c (ftfont_pattern_entity): Use the numeric value 100 for
745 FC_WEIGHT_REGULAR. Exclude FC_SIZE and FC_PIXEL_SIZE from listing
746 pattern. Don't force scalable.
748 * xftfont.c (xftfont_open): For generating a name, start from
751 2006-06-16 Jan Dj
\e,Ad
\e(Brv <jan.h.d@swipnet.se>
753 * frame.h (x_new_fontset2): Fix prototype.
755 2006-06-16 Kenichi Handa <handa@m17n.org>
757 * font.h (struct font_driver): Member parse_name deleted.
758 (font_match_p, font_get_spec, font_parse_fcname)
759 (font_unparse_fcname): Extern them.
760 (font_get_name): Prototype adjusted.
762 * font.c (XLFD_SMALLNUM_MASK): Delete this macro.
763 (XLFD_LARGENUM_MASK): Delete XLFD_ENCODING_MASK from it.
764 (font_expand_wildcards): Fix handling ENCODING field. Avoid
765 unnecessary checks for weight, slant, and swidth.
766 (font_parse_fcname): New function.
767 (font_unparse_fcname): New function.
768 (font_parse_name): New function.
769 (font_match_p): New function.
770 (font_get_name): Return value changed to Lisp string.
771 (font_get_spec): New function.
772 (Qunspecified, Qignore_defface): Don't extern them.
773 (font_find_for_lface): Assume that LFACE is fully specified.
774 (font_load_for_face): If lface[LFACE_FONT_INDEX] is an font
775 object, use it for FACE.
776 (font_open_by_name): Call Ffont_spec with QCname prop. Don't call
778 (Ffont_spec): Call font_parse_name, not font_parse_xlfd.
780 * fontset.h (new_fontset_from_font) [USE_FONT_BACKEND]: Prototype
783 * fontset.c (new_fontset_from_font) [USE_FONT_BACKEND]: Argument F
784 deleted. Don't call Fnew_fontset. Instead, directly call
787 * frame.h (x_new_fontset2) [USE_FONT_BACKEND]: Prototype adjusted.
789 * frame.c (x_set_font) [USE_FONT_BACKEND]: Adjusted for the change
792 * ftfont.c (Qmonospace, Qsans_serif, Qserif, Qmono, Qsans)
793 (Qsans__serif): New variables.
794 (ftfont_generic_family_list): New variable.
795 (syms_of_ftfont): Initialize the above variables.
796 (ftfont_pattern_entity): Argument NAME deleted.
797 (ftfont_list_generic_family): New function.
798 (ftfont_parse_name): Delete this function.
799 (ftfont_list): Try generic family only when FcFontList found no
801 (ftfont_list_family): Fix args to FcObjectSetBuild.
803 * xfaces.c (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
804 object in attrs[LFACE_FONT_INDEX].
805 (set_lface_from_font_name): Cancel all changes for font-backend.
806 (set_lface_from_font_and_fontset) [USE_FONT_BACKEND]: New
808 (Finternal_set_lisp_face_attribute) [USE_FONT_BACKEND]: Accept a
809 font object in QCfont attribute.
810 (set_font_frame_param) [USE_FONT_BACKEND]: Likewise.
811 (realize_default_face) [USE_FONT_BACKEND]: Call
812 set_lface_from_font_and_fontset.
814 * xfns.c (x_default_font_parameter) [USE_FONT_BACKEND]: Try also
815 "fixed", and signal error here if no suitable font was found.
817 * xfont.c (xfont_parse_name): Delete this function.
819 * xftfont.c (xftfont_open): Change coding style of error
820 handling. Generate fontconfig's fontname pattern.
822 * xterm.h (struct x_output) [USE_FONT_BACKEND]: New member fontp.
823 (FRAME_FONT_OBJECT) [USE_FONT_BACKEND]: New macro.
825 * xterm.c (x_new_fontset2) [USE_FONT_BACKEND]: Change arguments.
826 Both args FONTSET and FONT_OBJECT must be existing ones.
828 2006-06-16 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
830 * macterm.c (mac_set_unicode_keystroke_event): Don't use MAKE_CHAR.
832 2006-06-14 Kenichi Handa <handa@m17n.org>
834 * xfont.c (xfont_open, xfont_encode_char): Fix typo.
836 * font.h (struct font): Fix typo.
838 * font.c (enum xlfd_field_index): Rename XLFD_XXX_SIZE_INDEX to
840 (enum xlfd_field_mask): New enum.
841 (intern_font_field): Argument changed. Caller changed. If digits
842 are followed by non-digits, return a symbol.
843 (font_expand_wildcards): New function.
844 (font_parse_xlfd): Fix wildcard handling.
845 (Ffont_spec): If :name is specified, reflect the info in the other
848 * ftfont.c (ftfont_pattern_entity): Fix typo.
849 (ftfont_list): Enforce FC_LANG in PATTERN to cancel the effect of
852 2006-06-09 Kenichi Handa <handa@m17n.org>
854 * font.h (Qiso8859_1, Qiso10646_1, Qunicode_bmp): Extern them.
856 * font.c (Qiso8859_1, Qiso10646_1, Qunicode_bmp): Moved from
858 (font_unparse_xlfd): Fix argument type declaration. Append "*" if
859 registry doesn't specify encoding part.
860 (font_find_for_lface): Pay attention to LFACE_FONT_INDEX.
861 (font_open_by_name): At first try parsing the name.
862 (syms_of_font): Declare Qiso8859_1, Qiso10646_1, and Qunicode_bmp
865 * fontset.c (reorder_font_vector): Pay attention to the case that
866 the 3rd element of font_def is nil.
867 (fontset_font): For the default fontset, append one more fontset
868 elements for a script-based font specification. Don't add script
869 attribute on finding a font.
870 (new_fontset_from_font): Unconditionally set FONTSET_ASCII to the
872 (fontset_ascii_font): If a font can't be opened, return nil.
874 * ftfont.c (Qiso8859_1, Qiso10646_1, Qunicode_bmp): Moved to
876 (ftfont_pattern_entity): New function.
877 (ftfont_get_cache): Assume that freetype_font_cache is already
879 (ftfont_list): Handle the case that a file is specified in font
880 name. Use ftfont_pattern_entity to generate entities.
881 (ftfont_has_char): Check if the pattern contains FC_CHARSET.
882 (syms_of_ftfont): Initialize freetype_font_cache.
884 * xftfont.c (xftfont_open): Make the font name fontconfig's
885 style. Add BLOCK_INPUT and UNBLOCK_INPUT.
886 (xftfont_close): Free font->font.name if not NULL.
888 * xfont.c (xfont_list): If script is specified for a font, return
890 (xfont_list_family): Declare argument type.
892 * xfaces.c (set_lface_from_font_name): If a font doesn't have a
893 name, set LFACE_FONT (lface) to nil.
895 * xterm.c (x_new_fontset2): If an ASCII font couldn't be loaded,
898 2006-06-08 Jason Rumney <jasonr@gnu.org>
900 * w32term.c (w32_initialize): Manually sync 2006-06-05 change from
903 2006-06-08 Kenichi Handa <handa@m17n.org>
905 * emacs.c (main): Check -enable-font-backend arg after the check
907 (standard_args): Add "-enable-font-backend".
909 * coding.c (Ffind_operation_coding_system): Sync with HEAD.
911 * callproc.c (Fcall_process): Sync with HEAD.
913 * coding.h (CODING_REQUIRE_ENCODING): Comment sync with HEAD.
915 2006-06-07 Kenichi Handa <handa@m17n.org>
917 * xftfont.c (xftfont_default_fid): Set fid_known to 1.
918 (struct xftdraw_list, xftdraw_list): Delete them.
919 (register_xftdraw, check_xftdraw): Delete them.
920 (xftfont_prepare_face): Don't call register_xftdraw.
921 (xftfont_done_face): Don't call check_xftdraw.
922 (xftfont_draw): Get backroudn color only when with_background is
925 * xfont.c (xfont_encode_char): Fix calculation of char2b.
927 2006-06-06 Kenichi Handa <handa@m17n.org>
929 These changes are for the new font handling codes.
931 * Makefile.in (ALL_CFLAGS): Add @FREETYPE_CFLAGS@,
932 @FONTCONFIG_CFLAGS@, and @LIBOTF_CFLAGS@.
933 (LIB_X11_LIB): If HAVE_XFT is defined, set to @XFT_LIBS@.
934 (FONTSRC, FONTOBJ): New variables.
935 (obj): Add $(FONTOBJ).
936 (SOME_MACHINE_OBJECTS): Lib_X11_Lib.
937 (LIBES): Add @FREETYPE_LIBS@, @FONTCONFIG_LIBS@, and
939 (font.o, ftfont.o, xfont.o, xftfont.o, ftxfont.o): New targets.
940 (fontset.o, xdisp.o, xfaces.o, xfns.o, xterm.o): Depends on
943 * font.h, font.c, xfont.c, ftfont.c, xftfont.c, ftxfont.c: New
946 * character.h (Vscript_representative_chars): Extern it.
948 * character.c (Vscript_representative_chars): New variable.
949 (syms_of_character): Declare it as a Lisp variable.
951 * composite.c (get_composition_id) [USE_FONT_BACKEND]: If
952 enable_font_backend is nonzero, accept the composition method
953 COMPOSITION_WITH_GLYPH_STRING.
955 * composite.h (enum composition_method) [USE_FONT_BACKEND]: New
956 enumeration COMPOSITION_WITH_GLYPH_STRING.
958 * config.in: Re-generated.
960 * dispextern.h (struct glyph_string) [USE_FONT_BACKEND]: New
961 members clip_x, clip_y, clip_width, and clip_height.
962 (struct face) [USE_FONT_BACKEND]: New members font_info and extra.
964 * emacs.c (main) [USE_FONT_BACKEND]: Handle arg
965 --enable-font-backend. Call syms_of_font.
967 * fns.c (assoc_no_quit): New function.
969 * fontset.h (FONT_INFO_FROM_FACE): New macro.
970 (face_for_font, new_fontset_from_font)
971 (fontset_ascii_font) [USE_FONT_BACKEND]: Extern them.
973 * fontset.c [USE_FONT_BACKEND]: Include "font.h".
974 (fontset_font, fontset_ascii, face_for_char)
975 (make_fontset_for_ascii_face, Ffont_info)
976 (Finternal_char_font) [USE_FONT_BACKEND]: If enable_font_backend
977 is nonzero, use font-backend mechanism.
978 (find_font_encoding): Make it non-static.
979 (new_fontset_from_font, fontset_ascii_font) [USE_FONT_BACKEND]:
982 * frame.h (struct frame): New members resx and resy.
983 (struct frame) [USE_FONT_BACKEND]: New member font_driver_list.
984 (x_new_fontset2) [USE_FONT_BACKEND]: Extern it.
986 * frame.c [USE_FONT_BACKEND]: Include "font.h".
987 (make_frame, x_set_font) [USE_FONT_BACKEND]: Use font-backend
990 * lisp.h (assoc_no_quit): Extern it.
992 * xdisp.c: If USE_FONT_BACKEND is defined, include "font.h".
993 Through out the file, use FONT_INFO_FROM_FACE instead of
994 FONT_INFO_FROM_ID, use get_per_char_metric instead of
995 rif->per_char_metric.
996 (handle_composition_prop) [USE_FONT_BACKEND]: If the composition
997 method is COMPOSITION_WITH_GLYPH_STRING, just set it->c to ' '.
998 (get_glyph_face_and_encoding, fill_composite_glyph_string)
999 (get_char_face_and_encoding, BUILD_COMPOSITE_GLYPH_STRING)
1000 (x_produce_glyphs) [USE_FONT_BACKEND]: If enable_font_backend is
1001 nonzero, use font-backend mechanism.
1002 (get_per_char_metric): New function.
1004 * xfaces.c [USE_FONT_BACKEND]: Include "font.h".
1005 (set_lface_from_font_name)
1006 (set_font_frame_param, free_realized_face)
1007 (prepare_face_for_display, clear_face_gcs)
1008 (Finternal_set_font_selection_order, realize_x_face)
1009 [USE_FONT_BACKEND]: If enable_font_backend is nonzero, use
1010 font-backend mechanism.
1011 (clear_face_cache) [USE_FONT_BACKEND]: Don't call
1013 (load_face_font) [USE_FONT_BACKEND]: Abort.
1014 (face_symbolic_value, face_symbolic_weight, face_symbolic_slant)
1015 (face_symbolic_swidth, face_for_font) [USE_FONT_BACKEND]: New
1018 * xfns.c [USE_FONT_BACKEND]: Include "font.h".
1019 (x_default_font_parameter) [USE_FONT_BACKEND]: New function.
1020 (Fx_create_frame) [USE_FONT_BACKEND]: If enable_font_backend is
1021 nonzero, register all available font drivers. Call
1022 x_default_font_parameter for deciding a font.
1023 (x_create_tip_frame) [USE_FONT_BACKEND]: Likewise.
1025 * xterm.c [USE_FONT_BACKEND]: Include "font.h".
1026 (x_set_mouse_face_gc, x_set_glyph_string_clipping)
1027 (x_set_glyph_string_clipping_exactly)
1028 (x_compute_glyph_string_overhangs)
1029 (x_draw_glyph_string_foreground)
1030 (x_draw_composite_glyph_string_foreground, x_draw_glyph_string)
1031 (x_free_frame_resources) [USE_FONT_BACKEND]: If
1032 enable_font_backend is nonzero, use font-backend mechanism.
1033 (x_new_fontset2) [USE_FONT_BACKEND]: New function.
1035 2006-05-15 Kenichi Handa <handa@m17n.org>
1037 * coding.h (system_eol_type): Fix synching with HEAD.
1039 * coding.c (system_eol_type): Sync with HEAD.
1040 (coding_inherit_eol_type): If PARENT is nil, inherit from
1042 (syms_of_coding): Initialize system_eol_type.
1044 * callproc.c (Fcall_process): Sync with HEAD.
1046 * process.c (setup_process_coding_systems): Fix synching with
1048 (read_process_output): Likewise.
1049 (Fset_process_coding_system): Inherit system's eol format if
1052 * fileio.c (choose_write_coding_system): Fix synching with HEAD.
1054 * keymap.c (push_key_description): Fix synching with HEAD.
1056 2006-05-02 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
1058 * macgui.h (USE_ATSUI): Don't enable on emacs-unicode-2 branch.
1060 2006-04-07 Kenichi Handa <handa@m17n.org>
1062 * coding.c (decode_eol): Pay attention to buffer relocation in
1064 (decode_coding): Call decode_eol before restoring undo_list.
1066 2006-03-20 Kenichi Handa <handa@m17n.org>
1068 * charset.c (Fdefine_charset_internal): Fix setting of
1071 2006-03-14 Kenichi Handa <handa@m17n.org>
1073 * keyboard.c (read_char): Check if C is a character or not before
1074 looking up Vkeyboard_translate_table.
1076 2006-03-10 Kenichi Handa <handa@m17n.org>
1078 * coding.c (DECODE_EMACS_MULE_20_RELATIVE_COMPOSITION): Fix
1079 condition to terminate the loop.
1081 2006-03-09 Kenichi Handa <handa@m17n.org>
1083 * coding.c (produce_composition): Compare charbuf[i] instead of
1085 (Fterminal_coding_system): Use EQ to compare Lisp objects.
1087 2006-03-07 Kenichi Handa <handa@m17n.org>
1089 * coding.c (DECODE_COMPOSITION_START): If the source is short, set
1090 coding->result to CODING_RESULT_INSUFFICIENT_SRC.
1091 (decode_coding_gap): Set CODING_MODE_LAST_BLOCK after the call of
1093 (emacs_mule_char): Handle old style (Emacs 20) component character
1095 (DECODE_EMACS_MULE_COMPOSITION_RULE_20): Fix parsing a composition
1097 (DECODE_EMACS_MULE_20_RULEBASE_COMPOSITION): Likewise.
1098 (decode_coding_emacs_mule): Handle invalid bytes correctly.
1100 2006-03-04 Kenichi Handa <handa@m17n.org>
1102 * coding.c (encode_coding_ccl): Allocate destination dynamically
1105 2006-03-03 Kenichi Handa <handa@m17n.org>
1107 * ccl.c (Fccl_execute_on_string): Fix the condition of terminating
1108 the loop. When quitted, show a proper error message.
1110 2006-03-02 Kenichi Handa <handa@m17n.org>
1112 * coding.c (decode_coding): Fix previous change.
1114 * xterm.c (x_set_glyph_string_clipping_exactly): Set
1115 src->clip_head and src->clip_tail temporarily instead of src->hl.
1117 * ccl.c (CCL_WRITE_STRING): Handle a flag bit for multibyte
1119 (Fccl_execute_on_string): Use ASET, not XSET.
1121 2006-03-01 Kenichi Handa <handa@m17n.org>
1123 * search.c (search_buffer): Fix handling of "\\" in a trivial
1126 2006-02-28 Kenichi Handa <handa@m17n.org>
1128 * coding.c (decode_coding): Fix the condition of terminating the
1131 2006-02-27 Kenichi Handa <handa@m17n.org>
1133 * data.c (Faset): On setting a character bigger than 255 in a
1134 unibyte string, signal an error instead of make the string
1137 2006-02-22 Kenichi Handa <handa@m17n.org>
1139 * charset.c (map_charset_chars): Fix for ascii-compatible charset
1140 made by a mapping table.
1142 2006-02-21 Kenichi Handa <handa@m17n.org>
1144 * xdisp.c (fill_composite_glyph_string): Check s->face is NULL or
1146 (BUILD_COMPOSITE_GLYPH_STRING): If C is TAB, set s->face to NULL.
1147 (x_produce_glyphs): If CH is TAB, set cmp->offsets properly.
1149 * xterm.c (x_draw_composite_glyph_string_foreground): Check
1150 s->face is NULL or not.
1152 2006-02-20 Kenichi Handa <handa@m17n.org>
1154 * xterm.c (x_set_glyph_string_clipping_exactly): New function.
1155 (x_draw_glyph_string): Fix drawing of right_overhang and
1156 left_overhang around/on cursor.
1158 * xdisp.c (draw_glyphs): Fix inclusion of right_overwriting
1161 * term.c (produce_glyphs): Sync to HEAD.
1163 2006-02-15 Kenichi Handa <handa@m17n.org>
1165 * xdisp.c (x_produce_glyphs): Handle composition with TAB.
1167 2006-02-05 Kenichi Handa <handa@m17n.org>
1169 * coding.c: Cancel incorrect synching with HEAD.
1171 2006-02-03 Kenichi Handa <handa@m17n.org>
1173 * coding.c (Fdefine_coding_system_internal): Avoid a duplicated
1174 element in Vcoding_system_alist.
1175 (Fdefine_coding_system_alias): Likewise.
1177 2006-01-19 Kenichi Handa <handa@m17n.org>
1179 * xterm.c (handle_one_xevent): Handle keysyms 0x1000000..0x10000FF.
1181 * coding.c: Sync to HEAD for handling autoload-coding-system.
1182 (Qcoding_system_define_form): New variable.
1183 (syms_of_coding): Intern and staticpro it.
1184 (Fcoding_system_p): Check Qcoding_system_define_form.
1185 (Fcheck_coding_system): Try to autoload the definition of
1188 * coding.h (CODING_SYSTEM_P): If ID is not available, call
1190 (CHECK_CODING_SYSTEM): If ID is not available, call
1191 Fcheck_coding_system.
1192 (CHECK_CODING_SYSTEM_GET_SPEC): Try also Fcheck_coding_system.
1193 (CHECK_CODING_SYSTEM_GET_ID): Likewise.
1195 2006-01-17 Kenichi Handa <handa@m17n.org>
1197 * xterm.c (handle_one_xevent): Delete unnecessary code inserted by
1200 * coding.c (code_conversion_restore): GCPRO arg.
1202 2005-12-28 Kenichi Handa <handa@m17n.org>
1204 * character.c (lisp_string_width): Check multibyteness of STRING.
1206 2005-10-18 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
1208 * macterm.c (mac_encode_char): Call ccl_driver with the last arg
1209 Qnil. Use JIS_TO_SJIS instead of ENCODE_SJIS.
1210 (decode_mac_font_name): Use decode_coding_c_string instead of
1212 (x_load_font): Initialize fontp->fontset to -1. Set
1213 fontp->encoding_type.
1215 2005-10-17 Kenichi Handa <handa@m17n.org>
1217 * search.c (search_buffer): Give up BM search on case-fold-search
1218 if one of a target character has a case-equivalence of different
1219 byte length even if that target charcter is an ASCII.
1220 (simple_search): Fix culculation of byte length of matched text.
1221 (boyer_moore): Fix handling of case-equivalent multibyte
1224 2005-10-15 Kenichi Handa <handa@m17n.org>
1226 * coding.c (decode_coding): Fix handling of invalid bytes.
1228 2005-10-06 Kenichi Handa <handa@m17n.org>
1230 * xterm.c (handle_one_xevent): Handle keysyms directly mapped to
1233 2005-09-23 Kenichi Handa <handa@m17n.org>
1235 * coding.c (encode_coding_object): If a pre-write-conversion
1236 function makes a new buffer, kill it.
1238 2005-07-29 Kenichi Handa <handa@m17n.org>
1240 * coding.c (QCascii_compatible_p): New variable.
1241 (syms_of_coding): Initialize it.
1242 (ONE_MORE_BYTE): Decrement `src' before calling string_char.
1243 (ONE_MORE_BYTE_NO_CHECK): Likewise.
1244 (record_conversion_result): Add `default:' case.
1245 (coding_charset_list): Delete unused variable `coding_type'.
1246 (Fdefine_coding_system_internal): Add `ascii-compatible-p'
1247 property in the plist of the coding system.
1248 (Fcoding_system_put): Check QCascii_compatible_p.
1250 2005-06-09 Kenichi Handa <handa@m17n.org>
1252 * xdisp.c (get_next_display_element): Sync with the change in
1255 2005-06-06 Kenichi Handa <handa@m17n.org>
1257 * callproc.c (Fcall_process): Sync with the change in
1260 2005-06-05 Miles Bader <miles@gnu.org>
1262 * xfaces.c (Finternal_lisp_face_equal_p): Restore previously
1263 removed calculation of frame `f', as it's now used.
1265 2005-05-22 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
1267 * macterm.c (x_font_name_to_mac_font_name): Sync with trunk
1268 for the case that does not require code conversion.
1270 2005-05-11 Kenichi Handa <handa@m17n.org>
1272 * Makefile.in (shortlisp): Cancel previous change.
1273 (RUN_TEMACS): Include "-nl" if HAVE_SHM is defined.
1274 (emacs${EXEEXT}): Run $(RUN_TEMACS) unconditionally.
1275 (UNIDATA): New variable.
1276 (${lispsource}international/charprop.el): Depends on ${UNIDATA}.
1277 (bootstrap-emacs${EXEEXT}): Depends on charprop.el. Run
1278 $(RUN_TEMACS) unconditionally.
1280 2005-05-10 Kenichi Handa <handa@m17n.org>
1282 * Makefile.in (shortlisp): Add ../lisp/international/charprop.el.
1283 (temacs${EXEEXT}): Build charprop.el if necessary.
1284 (admindir): New variable.
1285 ($(lispsource)international/charprop.el): New target.
1287 2005-05-04 Miles Bader <miles@gnu.org>
1289 * character.c (chars-in-region): Obsolete function removed.
1290 (syms_of_character): Remove its initialization.
1292 2005-04-28 Benjamin Riefenstahl <b.riefenstahl@turtle-trading.net>
1294 * w32select.c (validate_coding_system)
1295 (setup_windows_coding_system): New functions.
1296 (convert_to_handle_as_coded, Fw32_get_clipboard_data): Use
1297 setup_windows_coding_system.
1298 (setup_config, Fw32_get_clipboard_data): Use
1299 validate_coding_system.
1300 (Fx_selection_exists): Move call to setup_config to a place
1301 were signals are allowed.
1303 * lisp.h (Fcoding_system_base, Fcoding_system_eol_type)
1304 (Fcheck_coding_system): Add declarations.
1306 2005-04-28 Kenichi Handa <handa@m17n.org>
1308 * s/ms-w32.h (STDC_HEADERS): Sync with the change in
1311 2005-04-25 Kenichi Handa <handa@m17n.org>
1313 * charset.c (load_charset_map_from_vector): Fix for the first
1316 2005-04-22 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
1318 * macfns.c (Fx_create_frame, x_create_tip_frame): Pass Lisp
1319 string as the second argument for x_new_fontset.
1321 2005-04-18 Kenichi Handa <handa@m17n.org>
1323 * fns.c (Fstring_as_multibyte): Fix the change for syncing with
1326 2005-04-09 Kenichi Handa <handa@m17n.org>
1328 * search.c (search_buffer): Fix the change for syncing with CVS
1330 (search_buffer): Likewise.
1332 2005-03-31 Kenichi Handa <handa@m17n.org>
1334 * xdisp.c (get_next_display_element): Sync with CVS head.
1336 2005-03-29 Kenichi Handa <handa@m17n.org>
1338 * coding.c (decode_coding_object): Use safe_call1 instead of call1.
1339 (encode_coding_object): Use safe_call instead of call2.
1341 2005-03-14 Kenichi Handa <handa@m17n.org>
1343 * fontset.c (set_default_ascii_font): Fix the change for
1344 syncing with CVS head.
1346 2005-01-30 Kenichi Handa <handa@m17n.org>
1348 * fontset.c (Fset_fontset_font): Check family element of a given
1351 * Makefile.in (lisp): Include charprop.el.
1353 2005-01-17 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
1355 * macfns.c (Fx_create_frame, x_create_tip_frame): Fix crash.
1356 Not sure if it's unnecessary.
1358 2005-01-16 Steven Tamm <steventamm@mac.com>
1360 * macfns.c (Fx_create_frame, x_create_tip_frame): ifdef'd out
1361 some possibly unnecessary fontset checking code that crashed
1362 when creating a new frame
1364 2005-01-17 Kenichi Handa <handa@m17n.org>
1366 * xfaces.c (merge_faces): Fix argument to lookup_derived_face and
1369 * xdisp.c (Fformat_mode_line): Fix argument to lookup_named_face.
1371 * fringe.c (draw_fringe_bitmap_1): Fix argument to
1374 2004-12-25 Kenichi Handa <handa@m17n.org>
1376 * xdisp.c (get_next_display_element): Sync to the change in HEAD
1379 2004-12-11 Kenichi Handa <handa@m17n.org>
1381 * search.c: Sync to the change in HEAD on 2004-11-19, 20.
1383 * w32console.c: Sync to the change in HEAD on 2004-12-01.
1385 * coding.c: Cancel the change done in HEAD on 2004-11-30.
1386 (coding_charset_list): New function.
1388 * coding.h (coding_charset_list): Extern it.
1390 * term.c: Sync to the change in HEAD on 2004-11-30.
1392 2004-12-09 Kenichi Handa <handa@m17n.org>
1394 * fontset.c (Fset_fontset_font): Call find_font_encoding with
1395 concatenation of family and registry.
1397 2004-12-06 Kenichi Handa <handa@m17n.org>
1399 * character.h (BYTE8_STRING): Fix typo.
1401 * editfns.c (Ftranslate_region_internal): Don't convert unibyte
1402 string to multibyte (sync to HEAD).
1404 * casefiddle.c (casify_region): Handle changes in byte-length
1405 using replace_range_2 (sync to HEAD).
1407 2004-11-24 Andreas Schwab <schwab@suse.de>
1409 * chartab.c (map_char_table): GCPRO table and arg.
1411 2004-10-29 Kenichi Handa <handa@m17n.org>
1413 * syntax.c (skip_syntaxes): Return lispy 0 (not nil) if point is
1416 2004-10-23 Kenichi Handa <handa@m17n.org>
1418 * fontset.c (fs_load_font): Use fast_string_match_ignore_case
1419 instead of fast_c_string_match_ignore_case.
1420 (find_font_encoding): Argument changed to Lisp_Object. Use
1421 fast_string_match_ignore_case instead of
1422 fast_c_string_match_ignore_case. Caller changed.
1424 2004-10-15 Kenichi Handa <handa@m17n.org>
1426 * xdisp.c (get_next_display_element): In unibyte case, decide to
1427 display in octal form by checking a chacter by
1428 UNIBYTE_CHAR_HAS_MULTIBYTE_P.
1430 * charset.c (Fset_unibyte_charset): Setup
1431 unibyte_has_multibyte_table.
1433 * character.c (unibyte_has_multibyte_table): New variable.
1435 * character.h (unibyte_has_multibyte_table): Extern it.
1436 (UNIBYTE_CHAR_HAS_MULTIBYTE_P): New macro.
1438 2004-10-14 Kenichi Handa <handa@m17n.org>
1440 * callproc.c (Fcall_process): Fix merging of 2004-10-13 change.
1442 2004-10-13 Kenichi Handa <handa@m17n.org>
1444 * coding.c (encode_coding_iso_2022): Fix handling of charset
1447 2004-10-12 Kenichi Handa <handa@m17n.org>
1449 * coding.c (setup_coding_system): If coding_system is nil, use
1451 (Fterminal_coding_system): Return nil if terminal coding system is
1453 (syms_of_coding): Define coding-system `undecided' here. Setup
1454 terminal_coding as `undecided'.
1456 2004-10-04 Kenichi Handa <handa@m17n.org>
1458 * xdisp.c (message_dolog, set_message_1): Call
1459 unibyte_char_to_multibyte with arg type int.
1461 * fileio.c (Fsubstitute_in_file_name): Fix previous change.
1463 * lread.c (read1): Fix reading of a char-table.
1465 * print.c (print_object): Include sub char-table in cicularities
1468 2004-10-01 Kenichi Handa <handa@m17n.org>
1470 * keymap.c (where_is_internal_2): Fix for the case that KEY is a
1471 cons. Append the found sequences in car of ARGS instead of
1474 2004-09-28 Kenichi Handa <handa@m17n.org>
1476 * fileio.c (report_file_error): Make a unibyte string from
1478 (Fsubstitute_in_file_name): Fix the arg to
1479 unibyte_char_to_multibyte. It is evaluated twice.
1481 2004-09-19 Kenichi Handa <handa@m17n.org>
1483 * charset.h (CHAR_CHARSET): Shortcut for ASCII case.
1485 2004-09-14 Kenichi Handa <handa@m17n.org>
1487 * coding.c (detect_coding): Fix previous change.
1489 2004-09-13 Kenichi Handa <handa@m17n.org>
1491 * coding.c (detect_coding_utf_16): Don't set detect_info->found if
1493 (detect_coding): Optimization for ISO-2022 when no 8-bit data is
1495 (detect_coding_system): Likewise.
1497 2004-09-01 Jason Rumney <jasonr@gnu.org>
1499 * w32fns.c (x_to_w32_font): Update to use new coding struct.
1501 2004-08-17 Kenichi Handa <handa@m17n.org>
1503 * charset.c (Fdeclare_equiv_charset): Fix handing of CHARS.
1504 (Fiso_charset): Likewise.
1506 2004-08-03 Steven Tamm <steventamm@mac.com>
1508 * macterm.c (mac_encode_char): Add charset argument and update
1509 to use encoding_type
1510 (x_new_font,x_new_fontset): Merge in changes from xterm.c;
1511 switch to pure fontset
1512 (decode_mac_font_name): Temporarily remove decoding
1513 (x_font_name_to_mac_font_name): Temporarily remove encoding
1514 (x_load_font): Temporarily remove encoding
1516 2004-06-30 Kenichi Handa <handa@m17n.org>
1518 * xfaces.c (Fface_font): If frame is not on a window system,
1519 ignore CHARACTER arg. If HAVE_WINDOW_SYSTEM is not defined, don't
1520 refer to face->font.
1521 (split_font_name_into_vector, build_font_name_from_vector)
1522 (lookup_non_ascii_face, realize_non_ascii_face): Define them only
1523 whne HAVE_WINDOW_SYSTEM is defined.
1525 2004-05-29 Kenichi Handa <handa@m17n.org>
1527 * xdisp.c (BUILD_GLYPH_STRINGS): Check if s is NULL.
1528 (x_produce_glyphs): Fix setting of members of cmp in case
1529 cmp->glyph_len is zero,
1531 * fontset.c (Fset_fontset_font): Docstring fixed.
1532 (Ffontset_info): Make it backward compatible. New arg ALL.
1534 2004-05-11 Kim F. Storm <storm@cua.dk>
1536 * process.c (read_process_output): Grow decoding_buf when needed;
1537 this could cause a crash in allocate_string and compact_small_strings.
1539 2004-04-29 Kenichi Handa <handa@m17n.org>
1541 * fileio.c (WRITE_BUF_SIZE): This macro deleted.
1542 (e_write): Fix previous change.
1544 2004-04-28 Kenichi Handa <handa@m17n.org>
1546 * coding.c (setup_coding_system): Set coding->common_flags
1547 correctly for raw-text.
1548 (consume_chars): On encoding unibyte text by raw-text, don't check
1550 (encode_coding): On encoding by raw-text, never use translation
1553 * fileio.c (e_write): Short cut for the case of no encoding.
1555 2004-04-20 Kenichi Handa <handa@m17n.org>
1557 * coding.c (detect_coding): Delete unused variables.
1558 (detect_coding_system): Likewise.
1560 2004-04-18 Kenichi Handa <handa@m17n.org>
1562 * coding.c (encode_coding_utf_8): Fix handling of raw-byte char.
1563 (consume_chars): Fix handling of 8-bit bytes in unibyte source.
1565 2004-04-14 Kenichi Handa <handa@m17n.org>
1567 Sync all files to HEAD.
1569 2004-04-14 Kenichi Handa <handa@m17n.org>
1571 * coding.c (Ffind_coding_systems_region_internal): Include
1572 raw-text and no-conversion in the result.
1574 * fontset.h: Sync to HEAD.
1576 * fontset.c: Sync to HEAD.
1578 2004-04-14 Kenichi Handa <handa@m17n.org>
1580 * fontset.c (find_font_encoding): Return `ascii' for unknown
1582 (load_font_get_repertory): Delete unnecessary check of ENCODING of
1584 (font_def_arg, add_arg, from_arg, to_arg): New args.
1585 (set_fontset_font): Argument changed.
1586 (Fset_fontset_font): Fix for the case that TARGET is a script
1587 name and charset name.
1588 (new_fontset_from_font_name): Fix argument to Fnew_fontset.
1590 2004-04-13 Kenichi Handa <handa@m17n.org>
1592 * fontset.c (fontset_font): Renamed from fontset_face. Return
1594 (face_suitable_for_char_p): Adjusted for the change of
1596 (face_for_char): Likewise.
1597 (make_fontset_for_ascii_face): Fix setting of the fontset element
1599 (Finternal_char_font): Use fontset_font instead of FACE_FOR_CHAR
1601 (Ffontset_info): Adjusted for the change of fontset_font.
1603 * composite.c: Sync to HEAD.
1605 * search.c: Sync to HEAD.
1607 * coding.c: Sync to HEAD.
1608 (emacs_mule_char): Check invalid code more regidly.
1610 * coding.h: Sync to HEAD.
1612 * charset.c: Sync to HEAD.
1614 * charset.h: Sync to HEAD.
1616 * character.h (LEADING_CODE_LATIN_1_MIN)
1617 (LEADING_CODE_LATIN_1_MAX): Delete these macros.
1619 2004-04-08 Kenichi Handa <handa@m17n.org>
1621 * category.h: Sync to HEAD.
1623 * category.c: Sync to HEAD.
1625 * syntax.h: Sync to HEAD.
1627 * syntax.c: Sync to HEAD.
1629 * regex.h: Sync to HEAD.
1631 * regex.c: Sync to HEAD.
1633 2004-04-07 Kenichi Handa <handa@m17n.org>
1635 * editfns.c: Sync to HEAD.
1636 (check_translation): New function.
1637 (Ftranslate_region_internal): Handle M:N mapping.
1639 2004-04-06 Kenichi Handa <handa@m17n.org>
1641 * xfaces.c (xlfd_point_size): Set font->numeric[XLFD_PIXEL_SIZE].
1643 2004-03-30 Kenichi Handa <handa@m17n.org>
1645 * coding.c (DECODE_DESIGNATION): Set chars_96 to -1 instead of
1647 (decode_coding_iso_2022): Fix handling of invalid designation.
1649 * fileio.c (Finsert_file_contents): Be sure to call unbind_to
1650 after calling code_conversion_save.
1652 2004-03-11 Kenichi Handa <handa@m17n.org>
1654 * xdisp.c (handle_auto_composed_prop): Fix Lisp_Object/int mixup.
1656 * print.c (print_prune_string_charset): Fix Lisp_Object/int mixup.
1658 * fontset.c: Include "intervals.h".
1659 (fontset_face): Fix comparing of Lisp_Objects.
1660 (free_face_fontset): Fix Lisp_Object/int mixup.
1661 (new_fontset_from_font_name): Likewise.
1663 * editfns.c (Ftranslate_region_internal): Fix Lisp_Object/int mixup.
1665 * coding.c: Add many prototypes for static functions.
1666 (get_translation_table): Allow max_lookup to be NULL.
1667 (decode_coding): Call get_translation_table with max_lookup NULL.
1668 (Ffind_coding_systems_region_internal): Likewise.
1669 (Funencodable_char_position, Fcheck_coding_systems_region):
1672 2004-03-11 Kenichi Handa <handa@m17n.org>
1674 * coding.c (get_translation_table): Declare it as Lisp_Object.
1675 (LOOKUP_TRANSLATION_TABLE): New macro.
1676 (produce_chars): Use LOOKUP_TRANSLATION_TABLE instead of
1678 (consume_chars): Likewise.
1680 2004-03-11 Kenichi Handa <handa@m17n.org>
1682 * coding.c (MAX_ANNOTATION_LENGTH): Adjusted for the change of
1683 annotation data format.
1684 (ADD_ANNOTATION_DATA, ADD_COMPOSITION_DATA, ADD_CHARSET_DATA):
1685 Change arguments FROM and TO to single argument NCHARS. Caller
1687 (decode_coding_utf_8): Pay attention to coding->charbuf_used.
1688 (decode_coding_utf_16, decode_coding_emacs_mule)
1689 (decode_coding_iso_2022, decode_coding_sjis, decode_coding_big5)
1690 (decode_coding_ccl, decode_coding_charset): Likewise.
1691 (get_translation): New function.
1692 (produce_chars): New arguments translation_table and last_block.
1693 Translate characters here. Return number of carryover chars.
1695 (produce_composition): New argument pos. Caller changed.
1696 Adjusted for the change of annotation data format.
1697 (produce_charset, produce_annotation): Likewise.
1698 (decode_coding, encode_coding): Don't call translate_chars.
1699 (consume_chars): New arg translation_table. Caller changed.
1700 (translate_chars): Deleted.
1701 (syms_of_coding): Make translation-table's number of extra slots
1704 2004-03-09 Kenichi Handa <handa@m17n.org>
1706 * search.c (simple_search): Fix setting this_pos_byte in backward
1709 * coding.c (detect_coding_emacs_mule): Fix counting of encoded
1711 (detect_coding_ccl): Fix setting of the variable valids.
1713 2004-03-04 Kenichi Handa <handa@m17n.org>
1715 * xterm.c (x_list_fonts): Fix the detection of an auto-scaled font.
1717 * coding.c (decode_coding_utf_16): Fix handling of surrogate pair.
1719 * editfns.c (Ftranslate_region_internal): Renamed from
1720 Ftranslate_region. Accept a char-table in TABLE.
1721 (syms_of_editfns): Defsubr Stranslate_region_internal.
1723 * xfaces.c (set_lface_from_font_name): If a font is specified for
1724 a frame, generate a fontset from the font.
1725 (build_scalable_font_name): If the scalable font is requested for
1726 a specific size, don't change that size.
1727 (try_font_list): Try a scalable font also in the case that a
1728 pattern string is specified,
1731 2004-03-03 Kenichi Handa <handa@m17n.org>
1733 * xfaces.c (Fface_font): New optional arg CHARACTER.
1735 2004-02-17 Kenichi Handa <handa@m17n.org>
1737 * charset.h (CHARSET_OFFSET): New macro.
1739 2004-02-13 Kenichi Handa <handa@m17n.org>
1741 * xterm.c (x_get_font_repertory): Fix for non-Unicode-bmp charset.
1743 * fontset.c (fontset_face): Handle the case that repertory is a
1745 (find_font_encoding): Return nil for unknown encoding.
1746 (Fset_fontset_font): Ignore a font of unknown encoding.
1748 2004-02-09 Kenichi Handa <handa@m17n.org>
1750 * keymap.c (describe_vector): Handle default value of a char
1753 * fontset.c (fontset_face): Handle fallback fonts correctly.
1754 (Ffontset_info): Return infomation about fallback fonts.
1756 2004-02-06 Kenichi Handa <handa@m17n.org>
1758 * fontset.c (FONTSET_DEFAULT): New macro.
1759 (FONTSET_ADD): Handle the case that range is nil.
1760 (fontset_add): Likewise.
1761 (Fset_fontset_font): Change the 2nd arg name to TARGET, and handle
1762 the case that it is nil.
1763 (dump_fontset): Call FONTSET_DEFAULT, not FONTSET_FALLBACK.
1764 (syms_of_fontset): Set char-table-extra-slots property of fontset
1767 * charset.h (CHAR_CHARSET_P): Fix for the case that the method is
1770 2004-01-30 Kenichi Handa <handa@m17n.org>
1772 * emacs.c (main): Call init_charset after syms_of_XXX.
1774 * charset.c (Vcharset_map_directory): Deleted.
1775 (Vcharset_map_path): New variable
1776 (load_charset_map_from_file): Use Vcharset_map_path instead.
1777 (init_charset): Initialize Vcharset_map_path.
1778 (syms_of_charset): Delete declaration of "charset-map-directory",
1779 add declaration of "charset-map-path".
1781 2004-01-29 Kenichi Handa <handa@m17n.org>
1783 * fns.c (string_char_to_byte): Optimize for ASCII only string.
1784 (string_byte_to_char): Likewise.
1786 * fileio.c (Finsert_file_contents): Avoid detecting a code twice.
1788 * coding.c (detect_coding_iso_2022): Fix handling of SS2 and SS3.
1789 (detect_coding): Treat '\0' as normal ASCII byte..
1790 (detect_coding_system): Likewise.
1792 2004-01-27 Kenichi Handa <handa@m17n.org>
1794 * coding.h (SJIS_TO_JIS2, JIS_TO_SJIS2): New macros.
1796 * coding.c (QCmnemonic, QCdefalut_char)
1797 (QCdecode_translation_table, QCencode_translation_table)
1798 (QCpost_read_conversion, QCpre_write_conversion): New variables.
1799 (get_translation_table): Return a list of translation tables if
1801 (decode_coding): Call get_translation_table with ENCODEP 0.
1802 (char_encodable_p): If translation_table is non-nil, always call
1804 (Fdefine_coding_system_internal): Accept list of translation
1805 tables as :encode-translation-table and :decode-translation-table.
1806 (Fcoding_system_put): New function.
1807 (syms_of_coding): Declare new symbols. Defsubr
1809 (decode_coding_sjis): Handle 4th charset (typically JISX0212).
1810 (encode_coding_sjis): Likewise.
1812 * charset.c (map_charset_chars): Fix arg to map_charset_chars in
1813 when the charset is superset type.
1815 * character.c (translate_char): Accept list of translation tables.
1817 2004-01-25 Kenichi Handa <handa@m17n.org>
1819 * coding.h (enum coding_attr_index): New member
1820 coding_attr_trans_tbl.
1821 (CODING_ATTR_TRANS_TBL): New macro.
1823 * coding.c (get_translation_table): New function.
1824 (translate_chars): Fix the bug of skipping annotation data.
1825 (decode_coding): Utilze get_translation_table.
1826 (encode_coding): Likewise.
1827 (char_encodable_p): Translate char if necessary.
1828 (Funencodable_char_position): Likewise.
1829 (Ffind_coding_systems_region_internal): Setup translation table
1830 for encode in a coding system attribute vector in advance.
1831 (Fcheck_coding_systems_region): Likewise.
1832 (Fdefine_coding_system_internal): Allow a symbol as translation
1833 table. For shift-jis type coding system, allow 4th charset.
1835 2004-01-24 Kenichi Handa <handa@m17n.org>
1837 * coding.c (decode_coding_sjis): Check the first byte rigidly.
1839 * xdisp.c (get_next_display_element): Pass -1 as POS to
1840 FACE_FOR_CHAR if displaying a C-string.
1842 2004-01-23 Kenichi Handa <handa@m17n.org>
1844 * composite.c (get_composition_id): Handle xoff and yoff in a
1847 * composite.h (COMPOSITION_DECODE_RULE): New arg xoff and yoff.
1848 (struct composition): New member lbearing and rbearing.
1850 * xdisp.c (move_it_to): Optimize for the case (op & MOVE_TO_Y).
1851 (x_get_glyph_overhangs): Handle a composition glyph.
1852 (x_produce_glyphs): Setup lbearing and rbreaing for a composition
1855 * xterm.c (x_compute_glyph_string_overhangs): Handle also a
1858 2004-01-18 Kenichi Handa <handa@m17n.org>
1860 * print.c: Include charset.h.
1861 (Vprint_charset_text_property): New variable.
1862 (Qdefault): Extern it.
1863 (PRINT_STRING_NON_CHARSET_FOUND)
1864 (PRINT_STRING_UNSAFE_CHARSET_FOUND): New macros.
1865 (print_check_string_result): New variable.
1866 (print_check_string_charset_prop): New function.
1867 (print_prune_charset_plist): New variable.
1868 (print_prune_string_charset): New function.
1869 (print_object): Call print_prune_string_charset if
1870 Vprint_charset_text_property is not t.
1871 (print_interval): Print nothing if itnerval->plist is nil.
1872 (syms_of_print): Declare Vprint_charset_text_property as a lisp
1873 variable. Init and staticpro print_prune_charset_plist.
1875 2004-01-15 Kenichi Handa <handa@m17n.org>
1877 * fontset.c (new_fontset_from_font_name): Use the specified font
1878 for all characters in the new fontset.
1880 * macterm.c (x_set_mouse_face_gc): Call FACE_FOR_CHAR with POS and
1883 * xdisp.c (x_produce_glyphs): Call FACE_FOR_CHAR with POS and
1884 OBJECT args for composition too.
1886 * w32term.c (x_set_mouse_face_gc): Call FACE_FOR_CHAR with POS and
1889 2004-01-13 Kenichi Handa <handa@m17n.org>
1891 * dispextern.h (FACE_FOR_CHAR): New args POS and OBJECT.
1893 * fontset.c (reorder_font_vector): Adjusted for the change of
1895 (fontset_face): New arg id. Caller changed.
1896 (face_for_char): New args pos and object.
1897 (make_fontset_for_ascii_face): Adjusted for the change of FONT_DEF
1899 (fs_query_fontset): Check NAME by Fassoc too.
1900 (Fset_fontset_font): Allow non-XLFD font name.
1901 (Ffontset_info): Adjusted for the change of FONT_DEF format.
1903 * fontset.h (face_for_char): Prototype adjusted.
1905 * xdisp.c (face_before_or_after_it_pos): Call FACE_FOR_CHAR with
1906 POS and OBJECT args.
1907 (get_next_display_element): Likewise.
1908 (append_space): Likewise.
1909 (extend_face_to_end_of_line): Likewise.
1910 (get_char_face_and_encoding): Likewise.
1911 (BUILD_COMPOSITE_GLYPH_STRING): Likewise.
1912 (x_produce_glyphs): Likewise.
1914 * xfaces.c (compute_char_face): Call FACE_FOR_CHAR with
1915 POS and OBJECT args.
1917 * xterm.c (x_set_mouse_face_gc): Call FACE_FOR_CHAR with
1918 POS and OBJECT args.
1920 2004-01-03 Jason Rumney <jasonr@gnu.org>
1922 * w32select.c (Fw32_set_clipboard_data): Avoid potential realloc
1923 of GlobalAlloc'ed memory.
1925 2003-12-29 Kenichi Handa <handa@m17n.org>
1927 * ccl.c (Fccl_execute_on_string): Fix the condition of loop.
1929 * charset.h (charset_table_used): Delete extern.
1931 * charset.c (charset_table_used): Make it static.
1932 (map_charset_chars): Fix args to c_function with.
1934 * chartab.c (map_sub_char_table_for_charset): Fix args to
1937 * coding.h (enum coding_result_code): Delete
1938 CODING_RESULT_INSUFFICIENT_CMP, add CODING_RESULT_INVALID_SRC.
1940 * coding.c (Qinsufficient_source, Qinconsistent_eol)
1941 (Qinvalid_source, Qinterrupted, Qinsufficient_memory): New
1943 (Vlast_code_conversion_error): New variables.
1944 (syms_of_coding): DEFSYM or DEFVAR_LISP them.
1945 (ONE_MORE_BYTE): Record error if any instead of signaling an
1946 error. If non-ASCII multibyte char is found, return the negative
1947 value of the code. All callers changed to check it.
1948 (ONE_MORE_BYTE_NO_CHECK): Likewise.
1949 (record_conversion_result): New function. All codes setting
1950 coding->result are changed to call this function.
1951 (detect_coding_utf_8): Don't use the local variable incomplete.
1952 (decode_coding_utf_8): Likewise.
1953 (emacs_mule_char): Change the second arg to `const'.
1954 (detect_coding_emacs_mule): Don't use the local variable
1956 (detect_coding_sjis): Likewise.
1957 (detect_coding_big5): Likewise.
1958 (decode_coding): Fix of flushing out unprocessed data.
1959 (make_conversion_work_buffer): Fix making of a work buffer.
1960 (decode_coding_object): Return coding->dst_object;
1962 * fontset.c (set_fontset_font): Fix args.
1964 * lisp.h (CHARACTERBITS): Define as 22.
1966 * process.c (send_process): Be sure to set coding->src_multibyte.
1968 * xdisp.c (handle_auto_composed_prop): Fix setting of limit.
1970 2003-12-02 Kenichi Handa <handa@m17n.org>
1972 * xdisp.c (handle_auto_composed_prop): Give limit to
1973 Fnext_single_char_property_change.
1975 2003-12-02 Kenichi Handa <handa@m17n.org>
1977 * coding.c (detect_coding): Fix previous change.
1978 (detect_coding_system): Likewise.
1980 2003-12-02 Kenichi Handa <handa@m17n.org>
1982 * composite.c (syms_of_composite): Don't make the compostion hash
1985 * fontset.c (Fset_fontset_font): Fix docstring.
1987 * lisp.h (detect_coding_system): Adjust prototype.
1989 * fileio.c (kill_workbuf_unwind): Delete this function.
1990 (Finsert_file_contents): Adjust the call of detect_coding_system.
1991 Get conversion_buffer by code_conversion_save. Use the macor
1992 CODING_MAY_REQUIRE_DECODING. After decoding, update
1995 * coding.h (make_conversion_work_buffer): Delete extern.
1996 (code_conversion_save): Extern it.
1998 * coding.c (enum iso_code_class_type): Delete ISO_carriage_return.
1999 (CODING_GET_INFO): Delete argument eol_type. Callers changed.
2000 (decode_coding_utf_8): Don't do eol converion.
2001 (detect_coding_utf_16): Check coding->src_chars, not
2002 coding->src_bytes. Add heuristics for those that have no
2004 (decode_coding_emacs_mule): Don't do eol converion.
2005 (decode_coding_iso_2022): Likewise.
2006 (decode_coding_sjis): Likewise.
2007 (decode_coding_big5): Likewise.
2008 (decode_coding_charset): Likewise.
2009 (adjust_coding_eol_type): Return a new coding system.
2010 (detect_coding): Don't detect eol. Fix for utf-16 detection.
2011 (decode_eol): In case of CRLF->LF conversion, use del_range_2 on
2013 (decode_coding): Pay attention to undo_list. Do eol convesion for
2014 all types of coding-systems (if necessary).
2015 (Vcode_conversion_work_buf_list): Delete it.
2016 (Vcode_conversion_reused_workbuf): Renamed from
2017 Vcode_conversion_reused_work_buf.
2018 (Vcode_conversion_workbuf_name): New variable.
2019 (reused_workbuf_in_use): New variable.
2020 (make_conversion_work_buffer): Delete the arg DEPTH.
2021 (code_conversion_restore): Argument changed to cons.
2022 (code_conversion_save): Delete the argument BUFFER. Callers
2024 (detect_coding_system): New argument src_chars. Callers changed.
2025 Fix for utf-16 detection.
2026 (init_coding_once): Don't use ISO_carriage_return.
2027 (syms_of_coding): Initialized Vcode_conversion_workbuf_name and
2028 reused_workbuf_in_use.
2030 2003-11-24 Kenichi Handa <handa@m17n.org>
2032 * keymap.c (store_in_keymap): Pay attention to the case that idx
2033 is a cons specifying a character range.
2035 * coding.c (Fdefine_coding_system_internal): Fix previous change.
2037 2003-11-23 Kenichi Handa <handa@m17n.org>
2039 * xdisp.c (handle_auto_composed_prop): Fix the case of returning
2040 HANDLED_RECOMPUTE_PROPS.
2042 * coding.c (Fdefine_coding_system_internal): Fix checking of
2043 ascii compatibility.
2045 2003-11-22 Kenichi Handa <handa@m17n.org>
2047 * charset.c (find_charsets_in_text): Delete unused locale
2049 (Fset_charset_priority): Update Vemacs_mule_charset_list too.
2051 * coding.c (encode_coding_emacs_mule): Emit bytes with MSB.
2052 Resync charset_list to Vemacs_mule_charset_list.
2054 * keymap.c (store_in_keymap): Pay attention to the case that idx
2055 is a cons specifying a character range.
2057 2003-11-18 Kenichi Handa <handa@m17n.org>
2059 * composite.c (update_compositions): Bind inhibit-read-only, etc
2060 to t before calling remove-list-of-text-properties.
2062 * print.c (print_object): Always print ASCII chars as is.
2064 2003-11-17 Kenichi Handa <handa@m17n.org>
2066 * keymap.c (Fdefine_key): Fix handling of Lucid style event type
2069 * fns.c (Fmapconcat): Signal an error if SEQUENCE is a char table.
2070 (Fmapcar): Likewise.
2073 2003-11-15 Kenichi Handa <handa@m17n.org>
2075 * syntax.c (skip_chars): Be sure to alloca char_ranges when
2078 2003-11-14 Kenichi Handa <handa@m17n.org>
2080 * xfaces.c (set_lface_from_font_name): Fix for the case that
2081 FONTNAME is not fontset name.
2083 2003-11-13 Kenichi Handa <handa@m17n.org>
2085 * fns.c (base64_encode_1): Fix previous change.
2087 2003-11-08 Kenichi Handa <handa@m17n.org>
2089 * fontset.c (set_fontset_font): New function.
2090 (Fset_fontset_font): If a font is specified for a charset, use
2091 map_charset_chars to store the font spec in a fontset.
2093 2003-10-29 Kenichi Handa <handa@m17n.org>
2095 * fontset.c (fontset_face): Create a fallback fontset on demand
2096 (make_fontset): Don't create a fallback fontset here.
2097 (free_face_fontset): Free a fallback fontset (if any) too.
2098 (n_auto_fontsets): Delete this variable.
2099 (auto_fontset_alist): New variable.
2100 (new_fontset_from_font_name): Check auto_fontset_alist.
2101 (dump_fontset) [FONTSET_DEBUG]: Fully re-written.
2102 (Ffontset_list_all) [FONTSET_DEBUG]: New function.
2103 (syms_of_fontset): Initialize and staticpro auto_fontset_alist.
2104 Defsubr Sfontset_list_all.
2106 2003-10-24 Kenichi Handa <handa@m17n.org>
2108 * xterm.c (x_list_fonts): Fix excluding of auto-scaled fonts.
2110 2003-10-23 Kenichi Handa <handa@m17n.org>
2112 * fontset.c (Fnew_fontset): Check NAME more rigidly.
2114 2003-10-17 Kenichi Handa <handa@m17n.org>
2116 * editfns.c (Fgoto_char): Fix docstring.
2118 2003-10-16 Kenichi Handa <handa@m17n.org>
2120 * insdel.c (insert_from_gap): Adjust intervals correctly.
2122 2003-10-12 Jason Rumney <jasonr@gnu.org>
2124 * w32term.c (GLYPHSET, WCRANGE): Define if system headers don't.
2125 (pfnGetFontUnicodeRanges): New dynamically loaded function.
2126 (w32_initialize): Try to load it.
2127 (x_get_font_repertory): Use it if available.
2128 (w32_encode_char): Add shortcut for unicode output.
2130 * w32fns.c (w32_load_system_font): Default charset to -1.
2131 (x_to_w32_charset): Match all fonts for unicode.
2132 (w32_to_x_charset): New parameter matching. Don't return partial
2133 or wildcard charsets.
2134 (w32_to_all_x_charsets): Don't return partial or wildcard charsets.
2135 (w32_codepage_for_font): Return CP_UNICODE for unicode.
2136 (w32_to_x_font): Match charset to real charset.
2137 (enum_font_cb2): Always list unicode versions.
2139 * makefile.w32-in (temacs): Increase EMHEAP.
2141 2003-10-11 Jason Rumney <jasonr@gnu.org>
2143 * w32term.c (w32_encode_char): New charset parameter.
2144 font_info.encoding becomes encoding_type.
2145 (x_get_font_repertory): New function. Warning: stub only!
2146 (x_new_font): Return quickly if font already set.
2147 (x_new_fontset): fontsetname parameter is Lisp_Object.
2148 Use new fs_query_fontset. Try new_fontset_from_font_name. Use
2149 fontset_name for return value.
2151 * w32term.h: Declare x_get_font_repertory.
2153 * w32select.c (Fw32_set_clipboard_data): Use string_x_string_p in
2154 place of find_charset_in_text. Use encode_coding_object in place
2156 (Fw32_get_clipboard_data): Use decode_coding_c_string in place of
2159 * w32fns.c (Fx_create_frame, x_create_tip_frame): Use new version
2161 (w32_load_system_font): Initialize charset as unicode.
2162 font_info.encoding becomes encoding_type.
2163 (w32_to_x_font): Use decode_coding_c_string in place of
2165 (x_to_w32_font): Use encode_coding_object in place of
2167 (syms_of_w32fns): Set get_font_repertory_func.
2169 * w32console.c: Include character.h. Use terminal_encode_buffer
2171 (write_glyphs): Use new version of encode_terminal_code. Use
2172 encode_coding_object in place of encode_coding.
2174 * w32bdf.c (w32_load_bdf_font): Clear font_info before filling.
2175 encoding becomes encoding_type.
2177 * term.c (terminal_encode_buffer): Make externally visible.
2179 * makefile.w32-in: Add character.h dependancies.
2180 (character.o, chartab.o): New targets.
2182 2003-10-10 Kenichi Handa <handa@m17n.org>
2184 * fileio.c (Finsert_file_contents) [DOS_NT]: Use the macro
2185 CODING_ID_EOL_TYPE..
2187 2003-10-07 Andreas Schwab <schwab@suse.de>
2189 * coding.c (produce_chars): Revert last change.
2191 2003-10-06 Kenichi Handa <handa@m17n.org>
2193 * charset.h (charset_unicode): Extern it.
2195 * charset.c (string_xstring_p): Check by (C >= 0x100).
2196 (find_charsets_in_text): Format of the arc CHARSETS changed. New
2198 (Ffind_charset_region, Ffind_charset_string): Adjusted for the
2199 change of find_charsets_in_text.
2200 (Fsplit_char): Fix doc. Never return unknown.
2202 * chartab.c (char_table_translate): Use CHARACTERP, not INETEGERP.
2204 * coding.c (Fdefine_coding_system_alias): Update
2205 Vcoding_system_list.
2207 * fontset.c (load_font_get_repertory): Pay attention to the case
2208 that ENCODING of a font is specified by a char-table.
2210 * xterm.c (x_get_font_repertory): Handle the case that the
2211 encoding of font is other than Unicode.
2213 2003-10-02 Kenichi Handa <handa@m17n.org>
2215 * term.c (encode_terminal_code): Don't handle glyph-table. Check
2216 if a character is encodable by the terminal coding system. If
2217 not, produces proper number of `?'s. Update
2218 terminal_encode_buffer and terminal_encode_buf_size if necessary.
2219 (produce_glyphs): Check by CHAR_BYTE8_P, not SINGLE_BYTE_CHAR_P.
2221 2003-10-01 Kenichi Handa <handa@m17n.org>
2223 * term.c (terminal_encode_buffer, terminal_encode_buf_size): New
2225 (encode_terminal_code): Argument changed. Encode multiple
2226 characters at once. Store the result of encoding in
2227 terminal_encode_buffer.
2228 (write_glyphs): Adjusted for the change of encode_terminal_code.
2229 (insert_glyphs): Likewise.
2230 (term_init): Initialize terminal_encode_buffer and
2231 terminal_encode_buf_size.
2233 * coding.c (consume_chars): If coding->src_object is nil, don't
2236 2003-09-30 Kenichi Handa <handa@m17n.org>
2238 * character.c (char_string): Use ASCII_CHAR_P instead of
2241 2003-09-30 Kenichi Handa <handa@m17n.org>
2243 * xdisp.c (handle_auto_composed_prop): Check if the last
2244 characters of auto-composed region is newly composed with the
2245 following characters.
2246 (handle_composition_prop): Fix checking of point being inside
2249 2003-09-26 Kenichi Handa <handa@m17n.org>
2251 * fns.c (concat): Don't change multibyteness of the result by
2252 concatenating an 8-bit character.
2254 * data.c (Faset): Check newelt by CHECK_CHARACTER. Don't change
2255 multibyteness of the result when newelt is an 8-bit character.
2257 2003-09-29 Dave Love <fx@gnu.org>
2259 * xmenu.c (find_and_call_menu_selection): Make menu_bar_items_used
2262 * xfns.c (DefaultDepthOfScreen, x_encode_text): Remove unused vars.
2264 * xfaces.c (face_numeric_value): Declare dim size_t.
2265 (Finternal_lisp_face_equal_p): Remove unused f.
2267 * xdisp.c (BUILD_CHAR_GLYPH_STRINGS, display_and_set_cursor)
2268 (MATRIX_ROW): Remove unused vars.
2269 (draw_glyphs, x_insert_glyphs, fast_find_position)
2270 (fast_find_position, fast_find_string_pos): Use EMACS_INT for
2273 * regex.c (regex_compile): Remove unused var.
2275 * minibuf.c (Fminibuffer_complete_word): Remove unused var.
2277 * keymap.c (Fset_keymap_parent, map_keymap, Fcopy_keymap)
2278 (Faccessible_keymaps, where_is_internal): Remove unused vars.
2280 * keyboard.c (cancel_hourglass_unwind): Return Qnil.
2282 * frame.c (frame_name_fnn_p): Make len EMACS_INT.
2284 * fileio.c (Fwrite_region): Remove unused var.
2286 * dispnew.c (adjust_frame_glyphs_for_frame_redisplay)
2287 (adjust_frame_glyphs_for_window_redisplay): Remove unused ch_dim.
2289 * composite.c (Fremove_list_of_text_properties): Declare.
2291 * coding.c (inhibit_pre_post_conversion): Removed (unused).
2292 (alloc_destination, produce_chars): Use EMACS_INT for byte/char
2294 (coding_inherit_eol_type): Remove unused attrs.
2295 (detect_coding): Cast arg of detect_eol.
2297 * charset.c (syms_of_charset): Remove unused var p.
2298 (find_charsets_in_text, Ffind_charset_region): Use EMACS_INT for
2301 * casetab.c (set_case_table): Remove unused var.
2303 * window.c (Fdisplay_buffer, Fframe_selected_window): Remove
2306 2003-09-26 Dave Love <fx@gnu.org>
2308 * xterm.c (x_bitmap_mask): Declare.
2310 2003-09-17 Dave Love <fx@gnu.org>
2312 * xterm.c (x_term_init): Fix type error.
2314 * lisp.h: Add Funibyte_char_to_multibyte.
2316 * coding.c (Fread_coding_system): Fix arg of XSETSTRING.
2317 (Fset_coding_system_priority): Doc fix.
2319 * alloc.c: Sync with HEAD version.
2321 * ccl.c (ccl_driver): Fix arg of CHARACTERP.
2323 * indent.c (check_composition): Make start and end EMACS_INT.
2325 * character.c (lisp_string_width): Make ignore and end EMACS_INT.
2327 * xdisp.c (handle_composition_prop, check_point_in_composition):
2328 Make buffer positions EMACS_INT.
2330 * composite.c (find_composition, run_composition_function)
2331 (update_compositions, Ffind_composition_internal): Make buffer
2332 positions EMACS_INT.
2334 * composite.h (find_composition, update_compositions): Make
2335 position args EMACS_INT.
2337 * keyboard.c (adjust_point_for_property): Make beg and end
2340 * intervals.c (get_property_and_range)
2341 * intervals.h (get_property_and_range): Make start and end EMACS_INT.
2343 * unexalpha.c: Don't include varargs.h.
2345 2003-09-16 Dave Love <fx@gnu.org>
2347 * coding.h (ENCODE_UTF_8): New.
2349 * Makefile.in (gtkutil.o): Depend on coding.h.
2351 * coding.c (Fset_coding_system_priority): Doc fix.
2353 2003-09-16 Kenichi Handa <handa@m17n.org>
2355 * fileio.c (Finsert_file_contents): Call setup_coding_system in
2356 the case of auto saving.
2358 2003-09-10 Andreas Schwab <schwab@suse.de>
2360 * chartab.c (map_char_table): Protect `range' from GC.
2361 (map_char_table_for_charset): Likewise.
2363 2003-07-09 Kenichi Handa <handa@m17n.org>
2365 * coding.c (decode_coding_sjis): Check bytes more rigidly.
2367 2003-06-26 Kenichi Handa <handa@m17n.org>
2369 * fileio.c (choose_write_coding_system): Return a decided coding
2371 (Fwrite_region): Set Vlast_coding_system_used to the return value
2372 of choose_write_coding_system.
2374 2003-06-06 Kenichi Handa <handa@m17n.org>
2376 * charset.c (Fset_charset_priority): Pay attention to duplicated
2379 * coding.c (QCcategory): New variable.
2380 (syms_of_coding): Defsym it. Set all elements of
2381 Vcoding_category_table and their symbol values.
2382 (Fset_coding_system_priority): Doc fix. Update symbol qvalues of
2383 coding-category-XXX, and coding-category-list.
2384 (Fdefine_coding_system_internal): Add category in the plist.
2386 2003-06-05 Kenichi Handa <handa@m17n.org>
2388 * callproc.c (Fcall_process): Handle carryover correctly.
2390 * coding.c (decode_coding_iso_2022): Fix handling of invalid
2392 (raw_text_coding_system): Check NILP (coding_system).
2393 (coding_inherit_eol_type): Check NILP (coding_system) and
2395 (consume_chars): Fix for the case of raw-text.
2397 * process.c (read_process_output): Handle carryover correctly.
2399 2003-06-02 Dave Love <fx@gnu.org>
2401 * regex.c (re_search_2): Fix last change.
2403 2003-05-30 Kenichi Handa <handa@m17n.org>
2405 * regex.c (GET_CHAR_BEFORE_2): Check multibyte, not
2406 target_multibyte. Even in a unibyte case, return a converted
2408 (GET_CHAR_AFTER): New macro.
2409 (PATFETCH): Translate via multibyte char.
2410 (HANDLE_UNIBYTE_RANGE): Delete this macro.
2411 (SETUP_MULTIBYTE_RANGE): New macro.
2412 (regex_compile): Setup compiled code so that its multibyteness
2413 matches that of a target. Fix the handling of "[X-YZ]" using
2414 SETUP_MULTIBYTE_RANGE.
2415 (analyse_first) <charset>: For filling fastmap for all multibyte
2416 characters, don't check by BASE_LEADING_CODE_P.
2417 (re_search_2): Don't check RE_TARGET_MULTIBYTE_P (bufp). It is
2418 the same as RE_MULTIBYTE_P (bufp) now.
2419 (mutually_exclusive_p): Check by (! multibyte ||
2421 (TARGET_CHAR_AND_LENGTH): Delete this macro.
2422 (TRANSLATE_VIA_MULTIBYTE): New macro.
2423 (re_match_2_internal): Don't check RE_TARGET_MULTIBYTE_P (bufp).
2424 It is the same as RE_MULTIBYTE_P (bufp) now.
2425 <exactn>: Translate via multibyte.
2426 <anychar>: Fetch a character by RE_STRING_CHAR_AND_LENGTH. Don't
2428 <charset, charset_not>: Fetch a character by
2429 RE_STRING_CHAR_AND_LENGTH. Translate via multibyte.
2430 <duplicate>: Call bcmp_translate with the last arg `multibyte'.
2431 <wordbound, notwordbound, wordbeg, wordend, syntaxspec,
2432 notsyntaxspec, categoryspec, notcategoryspec> Fetch a character
2434 (bcmp_translate): Likewise.
2436 * search.c (compile_pattern): Check the member target_multibyte,
2437 not the member multibyte of buf.
2439 * lread.c (read1): While reading a string, set force_singlebyte
2440 and force_multibyte correctly.
2442 * charset.c (Fset_unibyte_charset): Fix setting up of
2443 unibyte_to_multibyte_table.
2444 (init_charset_once): Likewise.
2446 2003-05-29 Kenichi Handa <handa@m17n.org>
2448 * coding.c (setup_coding_system): If coding has
2449 post-read-conversion or pre-write-conversion, set
2450 CODING_REQUIRE_DECODING_MASK and CODING_REQUIRE_ENCODING_MASK
2452 (decode_coding_gap): Run post-read-conversion if any.
2454 * fileio.c (Finsert_file_contents): Even if we read into a
2455 unibyte buffer, check if we must decode the result or not.
2457 2003-05-29 Kenichi Handa <handa@m17n.org>
2459 * coding.c (make_conversion_work_buffer): Change the work buffer
2460 name to the same one as that of Emacs 21.
2462 2003-05-28 Kenichi Handa <handa@m17n.org>
2464 * coding.h (make_conversion_work_buffer): Prototype adjusted.
2465 (code_conversion_restore): Don't extern it.
2467 * coding.c (detected_mask): Delete unused variable.
2468 (decode_coding_iso_2022): Pay attention to the byte sequence of
2469 CTEXT extended segment, and retain those bytes as is.
2470 (decode_coding_ccl): Delete unused variable `valids'.
2471 (setup_coding_system): Delete unused variable `category'.
2472 (consume_chars): Delete unused variable `category'. Make it work
2473 for non-multibyte case.
2474 (make_conversion_work_buffer): Argument changed.
2475 (saved_coding): Delete unused variable.
2476 (code_conversion_restore): Don't check saved_coding->destination.
2477 (code_conversion_save): New function.
2478 (decode_coding_gap, encode_coding_gap): Call code_conversion_save
2479 instead of record_unwind_protect.
2480 (decode_coding_object, encode_coding_object): Likewise. Recover
2482 (detect_coding_system): Delete unused variable `mask'.
2483 (Fdefine_coding_system_internal): Delete unsed vaiable id;
2485 * fileio.c (kill_workbuf_unwind): New function.
2486 (Finsert_file_contents): On replacing, call
2487 make_conversion_work_buffer with correct args, and call
2488 record_unwind_protect with the first arg kill_workbuf_unwind.
2490 * lisp.h (Fgenerate_new_buffer_name): EXFUN it.
2492 2003-05-20 Kenichi Handa <handa@m17n.org>
2494 * fontset.c (BASE_FONTSET_P): Check FONTSET_BASE, not
2496 (fontset_add): Fix for the case that TO is less than TO1.
2497 (Ffontset_info): Don't use fallback fontset on checking the
2499 (dump_fontset): New function for debugging.
2501 * coding.c (Fdefine_coding_system_internal): Fix for the case that
2502 coding_type is Qcharset.
2504 2003-05-07 Kenichi Handa <handa@m17n.org>
2506 * chartab.c (map_sub_char_table): New argument DEFAULT_VAL.
2507 (map_char_table): Don't inherit the value from the parent on
2508 initializing VAL. Adjusted for the above change.
2510 2003-05-06 Kenichi Handa <handa@m17n.org>
2512 * coding.c (Qsignature, Qendian): Delete these variables.
2513 (syms_of_coding): Don't initialize them.
2514 (CATEGORY_MASK_UTF_16_AUTO): New macro.
2515 (detect_coding_utf_16): Add CATEGORY_MASK_UTF_16_AUTO in
2517 (decode_coding_utf_16): Don't detect BOM here.
2518 (encode_coding_utf_16): Produce BOM if CODING_UTF_16_BOM (coding)
2519 is NOT utf_16_without_bom.
2520 (setup_coding_system): For a coding system of type utf-16, check
2521 if the attribute :endian is Qbig or not (not nil or not), and set
2522 CODING_REQUIRE_DETECTION_MASK if BOM detection is required.
2523 (detect_coding): If coding type is utf-16 and BOM detection is
2524 required, detect it.
2525 (Fdefine_coding_system_internal): For a coding system of type
2526 utf-16, check if the attribute :endian is Qbig or not (not nil or
2529 2003-05-06 Kenichi Handa <handa@m17n.org>
2531 * coding.c (coding_set_source): Fix for the case that the current
2532 buffer is different from coding->src_object.
2533 (decode_coding_object): Don't use the conversion work buffer if
2534 DST_OBJECT is a buffer.
2536 2003-05-04 Dave Love <fx@gnu.org>
2538 * lread.c (read_emacs_mule_char) [len==2]: Index
2539 emacs_mule_charset correctly.
2541 2003-02-16 Dave Love <fx@gnu.org>
2543 * coding.c (Qbig5, Vbig5_coding_system, CATEGORY_MASK_BIG5)
2544 (detect_coding_big5, decode_coding_big5, encode_coding_big5)
2545 (Fdecode_big5_char, Fencode_big5_char): Deleted. (Big5 no longer
2547 (setup_coding_system, coding_category, CATEGORY_MASK_ANY)
2548 (detected_mask): Remove Big5 bits.
2550 2003-04-09 Kenichi Handa <handa@m17n.org>
2552 The following changes are to make the font rescaling facility
2553 compatible with Emacs 21.
2555 * xfaces.c (Vface_font_rescale_alist): Renamed from
2556 Vface_resizing_fonts.
2557 (struct font_name): Rename member resizing_ratio to rescale_ratio.
2558 (font_rescale_ratio): Renamed from font_resizing_ratio.
2559 (split_font_name): Set font->rescale_ratio.
2560 (better_font_p): Pay attention to font->rescale_ratio.
2561 (build_scalable_font_name): Likewise. Change RESX, and RESY
2563 (syms_of_xfaces): Declare Vface_font_rescale_alist as a Lisp
2566 2003-03-28 Kenichi Handa <handa@m17n.org>
2568 * coding.c (Qutf_16_be_nosig, Qutf_16_be, Qutf_16_le_nosig)
2569 (Qutf_16_le): Remove these variables.
2570 (syms_of_coding): Don't DEFSYM them.
2571 (decode_coding_utf_16): Fix handling of BOM.
2572 (encode_coding_utf_16): Fix handling of BOM.
2574 2003-03-14 Kenichi Handa <handa@m17n.org>
2576 * fileio.c (Finsert_file_contents): On replacing, before decoding
2577 the file into the work buffer, set point of the work buffer to the
2580 2003-02-13 Dave Love <fx@gnu.org>
2582 * coding.c (Fcheck_coding_systems_region): Fix type errors.
2584 2003-02-04 Dave Love <fx@gnu.org>
2586 * xterm.c (XTread_socket): Check Lisp types for Vx_keysym_table
2589 2003-01-31 Kenichi Handa <handa@m17n.org>
2591 * xdisp.c (SKIP_GLYPHS): New macro.
2592 (set_cursor_from_row): Pay attention to string display properties.
2594 * category.c (copy_category_entry): Fix for the case that RANGE
2597 * xterm.c (x_encode_char): Call ccl_driver with the last arg Qnil.
2599 * w32term.c (w32_encode_char): Call ccl_driver with the last arg
2602 2003-01-30 Kenichi Handa <handa@m17n.org>
2604 * charset.c (Fcharset_id_internal): New function.
2605 (syms_of_charset): Defsubr it.
2607 * coding.c (decode_coding_ccl, encode_coding_ccl): Call ccl_driver
2608 with the last arg charset_list acquired from coding.
2609 (Fdefine_coding_system_internal): For ccl-based coding system, fix
2610 the attribute coding_attr_ccl_valids.
2612 * coding.h (enum define_coding_ccl_arg_index): Set the first
2613 member coding_arg_ccl_decoder to coding_arg_max.
2615 * ccl.h (ccl_driver): Prototype adjusted.
2617 * ccl.c (CCL_DECODE_CHAR, CCL_ENCODE_CHAR): New macros.
2618 (ccl_driver): New arg CHARSET_LIST. Use the above macros instead
2619 of DECODE_CAHR, ENCODE_CHAR, CHAR_CHARSET.
2620 (Fccl_execute): Call ccl_driver with the last arg Qnil.
2621 (Fccl_execute_on_string): Likewise.
2623 2003-01-11 Kenichi Handa <handa@m17n.org>
2625 * charset.h (ENCODE_CHAR): If the method is SUBSET or SUPERSET,
2628 * charset.c (encode_char): Fix handling of methods SUBSET and
2631 * xterm.c (x_new_fontset): Fix previous change.
2633 2003-01-10 Dave Love <fx@gnu.org>
2635 * composite.c (syms_of_composite): Make composition_hash_table
2638 2003-01-10 Kenichi Handa <handa@m17n.org>
2640 * dispextern.h (check_face_attributes, generate_ascii_font_name)
2641 (font_name_registry): Don't extern them.
2642 (split_font_name_into_vector, build_font_name_from_vector): Extern
2645 * fontset.h (Qfontset): Don't extern it.
2646 (new_fontset_from_font_name): Extern it.
2648 * fontset.c: Give 8 extra slots to fontset objects.
2649 (Qfontset_info): New variable.
2650 (syms_of_fontset): Defsym it.
2651 (FONTSET_FALLBACK): New macro.
2652 (fontset_face): Try also the default fontset.
2653 (make_fontset): Realize a fallback fontset from the default
2655 (generate_ascii_font_name): Moved from xfaces.c. Rewritten by
2656 using split_font_name_into_vector and build_font_name_from_vector.
2657 (Fset_fontset_font): Access the elements of font_spec by enum
2658 FONT_SPEC_INDEX. If font_spec is a string, extract the registry
2659 name by using split_font_name_into_vector.
2660 (Fnew_fontset): If no ASCII font is specified in FONTLIST,
2661 generate a proper font name from the fontset name. Update
2662 Vfontset_alias_alist.
2663 (n_auto_fontsets): New variable.
2664 (new_fontset_from_font_name): New function.
2665 (Ffont_info): Store the information about fonts generated from the
2666 default fontset in the first extra slot of the returned
2669 * xfaces.c (generate_ascii_font_name): Moved to fontset.c.
2670 (font_name_registry): Function deleted.
2671 (split_font_name_into_vector): New function.
2672 (build_font_name_from_vector): New function.
2673 (font_list): The argument REGISTRY is now a list of registry
2675 (choose_face_font): If we are choosing an ASCII font, and ATTRS
2676 specifies an explicit font name, return the name as is. Make a
2677 list of registy names.
2679 * xfns.c (x_set_font, x_create_tip_frame): Adjusted to the change
2681 (Fx_create_frame): Don't call x_new_fontset here. Just use
2682 x_list_fonts to check the existence of fonts.
2684 * xterm.h (x_new_fontset): Prototype adjusted.
2686 * xterm.c (x_new_fontset): Change the arg FONTSETNAME to Lisp
2687 string. Use new_fontset_from_font_name to create a fontset from a
2690 2003-01-07 Dave Love <fx@gnu.org>
2692 * Makefile.in: Fix some dependencies.
2694 * keymap.c (Fapropos_internal): Don't gcpro apropos_predicate but
2695 set it to nil before returning.
2697 * composite.c (update_compositions): Fix type error.
2699 * syntax.c (skip_chars, skip_syntaxes): Fix type errors.
2701 2003-01-07 Kenichi Handa <handa@m17n.org>
2703 * xterm.c (x_new_font): Optimize for the case that the font is
2704 already set for the frame.
2706 2003-01-06 Kenichi Handa <handa@m17n.org>
2708 * chartab.c (char_table_ascii): Check if the char table contents
2709 is sub-char-table or not.
2710 (char_table_set): Fix argument to char_table_ascii.
2711 (char_table_set_range): Likewise.
2713 * coding.c (CATEGORY_MASK_RAW_TEXT): New macro.
2714 (detect_coding_utf_8, detect_coding_utf_16)
2715 (detect_coding_emacs_mule, detect_coding_iso_2022)
2716 (detect_coding_sjis, detect_coding_big5)
2717 (detect_coding_ccl, detect_coding_charset): Change argument MASK
2718 to DETECT_INFO. Update DETECT_INFO and return 1 if the byte
2719 sequence is valid in this coding system. Callers changed.
2720 (MAX_ANNOTATION_LENGTH): New macro.
2721 (ADD_ANNOTATION_DATA): New macro.
2722 (ADD_COMPOSITION_DATA): Argument changed. Callers changed. Call
2723 ADD_ANNOTATION_DATA. The format of annotation data changed.
2724 (ADD_CHARSET_DATA): New macro.
2725 (emacs_mule_char): New argument ID. Callers changed.
2726 (decode_coding_emacs_mule, decode_coding_iso_2022)
2727 (decode_coding_sjis, decode_coding_big5, decode_coding_charset):
2728 Produce charset annotation data in coding->charbuf.
2729 (encode_coding_emacs_mule, encode_coding_iso_2022): Pay attention
2730 to charset annotation data in coding->charbuf.
2731 (setup_coding_system): Add CODING_ANNOTATE_CHARSET_MASK
2732 coding->common_flags if the coding system is iso-2022 based and
2734 (produce_composition): Adjusted for the new annotation data
2736 (produce_charset): New function.
2737 (produce_annotation): Handle charset annotation.
2738 (handle_composition_annotation, handle_charset_annotation): New
2740 (consume_chars): Handle charset annotation. Utilize the above two
2742 (encode_coding_object): If SRC_OBJECT and DST_OBJECT are the same
2743 buffer, get the deleted text as a string and set
2744 coding->src_object to that string.
2745 (detect_coding, detect_coding_system): Use the new struct
2746 coding_detection_info.
2748 * coding.h (struct coding_detection_info): New structure.
2749 (struct coding_system): Prototype of the member `detector'
2751 (CODING_ANNOTATE_CHARSET_MASK): New macro.
2753 2003-01-06 Kenichi Handa <handa@m17n.org>
2755 * insdel.c (insert_from_gap): Fix argument to offset_intervals.
2757 2003-01-03 Dave Love <fx@gnu.org>
2759 * keymap.c (apropos_predicate, apropos_accumulate): Declare
2761 (Fapropos_internal): Don't gcpro apropos_accumulate. Set result
2762 to new local and nullify apropos_accumulate before returning.
2763 (syms_of_keymap): Staticpro and initialize apropos_accumulate.
2765 2002-12-05 Kenichi Handa <handa@m17n.org>
2767 * charset.c (Fdefine_charset_internal): Setup charset.fast_map
2770 2002-11-26 Dave Love <fx@gnu.org>
2772 * fns.c (Flanginfo): Call synchronize_system_time_locale.
2774 2002-11-07 Kenichi Handa <handa@m17n.org>
2776 The following changes are to make character composition happen
2777 automatically on displaying.
2779 * Makefile.in (lisp, shortlisp): Add composite.elc
2781 * composite.h (Qauto_composed, Vauto_composition_function,
2782 Qauto_composition_function): Extern them.
2784 * composite.c (Vcomposition_function_table,
2785 Qcomposition_function_table): Delete variables.
2786 (Qauto_composed, Vauto_composition_function,
2787 Qauto_composition_function): New variables.
2788 (run_composition_function): Don't call
2789 compose-chars-after-function.
2790 (update_compositions): Clear `auto-composed' text property.
2791 (compose_chars_in_text): Delete this function.
2792 (syms_of_composite): Staticpro Qauto_composed and
2793 Qauto_composition_function. Declare Vauto_composition_function as
2796 * dispextern.h (enum prop_idx): Add member AUTO_COMPOSED_PROP_IDX.
2798 * xdisp.c (it_props): Add an entry for Qauto_composed.
2799 (handle_auto_composed_prop): New function.
2801 * xselect.c (selection_data_to_lisp_data): Don't call
2802 compose_chars_in_text.
2804 2002-11-06 Dave Love <fx@gnu.org>
2806 * keyboard.c (read_char): Modify checking around use of
2807 Vkeyboard_translate_table.
2809 * xterm.c (XTread_socket): Check Lisp types for Vx_keysym_table
2812 2002-11-06 Kenichi Handa <handa@m17n.org>
2814 * coding.c (decode_coding_utf_8): When eol_type is Qdos, handle
2815 the case that the last byte is '\r' correctly.
2816 (decode_coding_emacs_mule): Likewise.
2817 (decode_coding_iso_2022): Likewise.
2818 (decode_coding_sjis): Likewise.
2819 (decode_coding_big5): Likewise.
2820 (decode_coding_charset): Likewise.
2821 (produce_chars): Likewise.
2822 (decode_coding): Flushing out the unprocessed data correctly.
2823 (decode_coding_gap): Set CODING_MODE_LAST_BLOCK bit of
2826 2002-10-31 Dave Love <fx@gnu.org>
2828 * xterm.c (XTread_socket): Fix changes for defined keysyms. Add
2830 (xaw_scroll_callback): Revert last change.
2832 2002-10-30 Kenichi Handa <handa@m17n.org>
2834 * charset.c (Fset_charset_priority): Update
2835 Viso_2022_charset_list.
2837 2002-10-29 Kenichi Handa <handa@m17n.org>
2839 * xfaces.c (Vface_resizing_fonts): New variable.
2840 (struct font_name): New member `resizing_ratio'.
2841 (font_resizing_ratio): New function.
2842 (split_font_name): Set font->resizing_ratio.
2843 (better_font_p): Pay attention to font->resizing_ratio.
2844 (build_scalable_font_name): Likewise. Don't change POINT_SIZE,
2845 RESX, and RESY fields.
2846 (try_alternative_families): Try scalable fonts if
2847 Vscalable_fonts_allowed is not Qt.
2848 (syms_of_xfaces): Declare Vface_resizing_fonts as a Lisp variable.
2850 2002-10-29 Dave Love <fx@gnu.org>
2852 * xterm.c (xaw_scroll_callback): Cast correctly.
2854 2002-10-28 Dave Love <fx@gnu.org>
2856 * keyboard.c (lispy_accent_codes, lispy_accent_keys): Extend.
2857 (lispy_kana_keys): Comment out.
2858 (make_lispy_event) [XK_kana_A]: Comment out.
2860 * xterm.c (xaw_scroll_callback): Cast call_data.
2861 (XTread_socket): Deal with ASCII keysyms.
2862 (syms_of_xterm) <Vx_keysym_table>: Fix args of make_hash_table.
2864 2002-10-27 Dave Love <fx@gnu.org>
2866 * xterm.c (Vx_keysym_table): New.
2867 (syms_of_xterm): Initialize it.
2868 (XTread_socket): Use it.
2869 From head: Eliminate incorrect optimization that tried to avoid
2870 decoding the output of X*LookupString.
2871 (x_get_font_repertory): Delete charset declaration.
2873 2002-10-16 Kenichi Handa <handa@m17n.org>
2875 * coding.c (detect_coding): Fix previous change.
2876 (detect_coding_charset): If only ASCII bytes are found, return 0.
2877 (detect_coding_system): Fix previous change.
2878 (Fdefine_coding_system_internal): Setup CODING_ATTR_ASCII_COMPAT
2881 2002-10-15 Dave Love <fx@gnu.org>
2883 * coding.c (Fcheck_coding_system): Doc fix.
2885 * editfns.c (Finsert_byte): Return a proper value.
2887 2002-10-14 Kenichi Handa <handa@m17n.org>
2889 * coding.c (decode_coding): Fix args to translate_chars. Pay
2890 attention to Vstandard_translation_table_for_decode.
2891 (encode_coding): Fix args to translate_chars. Pay attention to
2892 Vstandard_translation_table_for_encode.
2894 * data.c (Faset): Check NEWELT by ASCII_CHAR_P, not by
2897 * editfns.c (general_insert_function): Check VAL by ASCII_CHAR_P,
2898 not by SINGLE_BYTE_CHAR_P.
2900 * fns.c (concat): Check CH by ASCII_CHAR_P, not by
2903 * insdel.c (copy_text): Check C by ASCII_CHAR_P, not by
2906 * keymap.c (Ftext_char_description): Check C by ASCII_CHAR_P, not
2907 by SINGLE_BYTE_CHAR_P.
2909 * search.c (Freplace_match): Check C by ASCII_CHAR_P, not by
2912 2002-10-14 Dave Love <fx@gnu.org>
2914 * fns.c (Fstring_as_multibyte, Fstring_to_multibyte): Doc fix.
2916 2002-10-10 Dave Love <fx@gnu.org>
2918 * fns.c (Flanginfo): Fix typo.
2920 * unexelf.c (unexec): Make last change conditional on Irix 6.5.
2922 2002-10-10 Kenichi Handa <handa@m17n.org>
2924 * coding.c (detect_coding_utf_8): Check incomplete byte sequence.
2925 Don't update *mask when correctly detected.
2926 (detect_coding_utf_16): Likewise.
2927 (detect_coding_emacs_mule): Likewise.
2928 (detect_coding_iso_2022): Likewise.
2929 (detect_coding_sjis): Likewise.
2930 (detect_coding_big5): Likewise.
2931 (detect_coding_ccl): Likewise.
2932 (decode_coding_sjis): Fix decoding of katakana-jisx0201.
2933 (detect_eol): Delete the argument CODING, and add the argument
2935 (detect_coding): Adjusted for the changes above.
2936 (detect_coding_system): Likewise.
2938 2002-10-09 Kenichi Handa <handa@m17n.org>
2940 * character.c (char_string): Renamed from
2941 char_string_with_unification. Pay attention to
2943 (string_char): Renamed from string_char.
2945 * character.h (CHAR_STRING): Call char_string if C is greater than
2947 (CHAR_STRING_ADVANCE): Likewise.
2948 (STRING_CHAR): Call string_char instead of
2949 string_char_with_unification.
2950 (STRING_CHAR_AND_LENGTH): Likewise.
2951 (STRING_CHAR_ADVANCE): Likewise.
2953 2002-10-09 Dave Love <fx@gnu.org>
2955 * coding.c (decode_coding_utf_8): Treat surrogates as invalid.
2957 2002-10-07 Kenichi Handa <handa@m17n.org>
2959 * keymap.c (push_key_description): Pay attention to
2962 * regex.c (re_search_2): Fix for the case of unibyte buffer.
2964 2002-10-06 Dave Love <fx@gnu.org>
2966 * charset.c (define_charset_internal): Rename `supprementary'.
2968 * Makefile.in (lisp, shortlisp): Remove latin-N.
2970 2002-10-05 Dave Love <fx@gnu.org>
2972 * xfns.c (x_window, x_window): Use use_xim.
2974 * xterm.c (use_xim): Initialize.
2975 (xim_open_dpy, xim_initialize, xim_close_dpy): Use use_xim.
2976 (x_term_init): Maybe set use_xim.
2978 * xterm.h (use_xim) [HAVE_X_I18N]: Declare.
2980 2002-10-01 Kenichi Handa <handa@m17n.org>
2982 * search.c (search_buffer): Fix case-fold-search of multibyte
2984 (boyer_moore): Rename the last argument to char_high_bits.
2986 2002-09-27 Kenichi Handa <handa@m17n.org>
2988 * xdisp.c (display_string): Fix for the case of zero width glyph.
2990 * xfns.c (x_set_font): Change the error message of the case that
2991 x_new_fontset returns Qt.
2993 * xfaces.c (set_lface_from_font_name): Reject the default fontset.
2994 (Finternal_set_lisp_face_attribute): Use signal_error for the
2995 error of invalid fontset.
2997 * xterm.c (x_new_fontset): If FONTSETNAME specifies the default
3000 2002-09-19 Kenichi Handa <handa@m17n.org>
3002 * regex.c (re_search_2): Fix previous change.
3004 2002-09-18 Kenichi Handa <handa@m17n.org>
3006 * syntax.c (skip_syntaxes): Fix previous change.
3008 2002-09-13 Kenichi Handa <handa@m17n.org>
3010 * syntax.c (skip_chars): Fix previous change.
3011 (skip_syntaxes): Fix previous change.
3013 2002-09-06 Dave Love <fx@gnu.org>
3015 * config.in: Restore it.
3017 2002-09-05 Dave Love <fx@gnu.org>
3019 * config.in: Removed (now auto-generated).
3021 * s/usg5-4.h: Fix last change.
3023 * unexelf.c (unexec): Make .got handling not SGI-specific.
3025 * syntax.c (syms_of_syntax) <multibyte-syntax-as-symbol>: Doc fix.
3027 * regex.c: Use `ifdef HAVE_ALLOCA_H', not `if HAVE_ALLOCA_H'.
3029 * keyboard.c (read_key_sequence): Fix type error.
3031 * buffer.c (Fset_buffer_multibyte, Fset_buffer_multibyte): Fix
3034 * fontset.c (fontset_add): Return Lisp_Object.
3036 2002-09-03 Dave Love <fx@gnu.org>
3038 * charset.h (charset_ordered_list_tick): Declare extern.
3040 2002-09-03 Kenichi Handa <handa@m17n.org>
3042 The following changes (and some of 2002-08-20 changes of mine) are
3043 for handling syntax, category, and case conversion for unibyte
3044 characters by converting them to multibyte on the fly. With these
3045 changes, we don't have to setup syntax and case tables for unibyte
3046 characters in each language environment.
3048 * abbrev.c (Fexpand_abbrev): Convert a unibyte character to
3049 multibyte if necessary.
3051 * bytecode.c (Fbyte_code): Likewise.
3053 * character.h (LEADING_CODE_LATIN_1_MIN)
3054 (LEADING_CODE_LATIN_1_MAX): New macros.
3055 (unibyte_to_multibyte_table): Extern it.
3056 (unibyte_char_to_multibyte): New macro.
3057 (MAKE_CHAR_MULTIBYTE): Use unibyte_to_multibyte_table.
3058 (CHAR_LEADING_CODE): New macro.
3059 (FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE): New macro.
3061 * character.c (unibyte_to_multibyte_table): New variable.
3062 (unibyte_char_to_multibyte): Move to character.h and defined as
3064 (multibyte_char_to_unibyte): If C is an eight-bit character,
3065 convert it to the corresponding byte value.
3067 * charset.c (Fset_unibyte_charset): If the dimension of CHARSET is
3068 not 1, singals an error. Update the elements of
3069 unibyte_to_multibyte_table.
3070 (init_charset_once): Initialize unibyte_to_multibyte_table.
3071 (syms_of_charset): Define the charset `iso-8859-1'.
3073 * casefiddle.c (casify_object): Fix previous change.
3075 * cmds.c (internal_self_insert): In a multibyte buffer, insert C
3076 as is without converting it to unibyte. In a unibyte buffer,
3077 convert C to multibyte before checking the syntax.
3079 * lisp.h (unibyte_char_to_multibyte): Extern deleted.
3081 * minibuf.c (Fminibuffer_complete_word): Use the macro
3082 FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE.
3084 * regex.h (struct re_pattern_buffer): New member target_multibyte.
3086 * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
3087 (GET_CHAR_BEFORE_2): Check target_multibyte, not multibyte. If
3088 that is zero, convert an eight-bit char to multibyte.
3089 (MAKE_CHAR_MULTIBYTE, CHAR_LEADING_CODE): New dummy new macros for
3091 (PATFETCH): Convert an eight-bit char to multibyte.
3092 (HANDLE_UNIBYTE_RANGE): New macro.
3093 (regex_compile): Setup the compiled pattern for multibyte chars
3094 even if the given regex string is unibyte. Use PATFETCH_RAW
3095 instead of PATFETCH in many places. To handle `charset'
3096 specification of unibyte, call HANDLE_UNIBYTE_RANGE. Use bitmap
3097 only for ASCII chars.
3098 (analyse_first) <exactn>: Simplified because the compiled pattern
3100 <charset_not>: Setup fastmap from bitmap only for ASCII chars.
3101 <charset>: Use CHAR_LEADING_CODE to get leading codes.
3102 <categoryspec>: If multibyte, setup fastmap only for ASCII chars
3104 (re_compile_fastmap) [emacs]: Call analyse_first with the arg
3106 (re_search_2) In emacs, set the locale variable multibyte to 1,
3107 otherwise to 0. New local variable target_multibyte. Check it
3108 to decide the multibyteness of STR1 and STR2. If
3109 target_multibyte is zero, convert unibyte chars to multibyte
3110 before translating and checking fastmap.
3111 (TARGET_CHAR_AND_LENGTH): New macro.
3112 (re_match_2_internal): In emacs, set the locale variable multibyte
3113 to 1, otherwise to 0. New local variable target_multibyte. Check
3114 it to decide the multibyteness of STR1 and STR2. Use
3115 TARGET_CHAR_AND_LENGTH to fetch a character from D.
3116 <charset, charset_not>: If multibyte is nonzero, check fastmap
3117 only for ASCII chars. Call bcmp_translate with
3118 target_multibyte, not with multibyte.
3119 <begline>: Declare the local variable C as `unsigned'.
3120 (bcmp_translate): Change the last arg name to target_multibyte.
3122 * search.c (compile_pattern_1): Don't adjust the multibyteness of
3123 the regexp pattern and the matching target. Set cp->buf.multibyte
3124 to the multibyteness of the regexp pattern. Set
3125 cp->but.target_multibyte to the multibyteness of the matching
3127 (wordify): Use FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE instead of
3128 FETCH_STRING_CHAR_ADVANCE.
3129 (Freplace_match): Convert unibyte chars to multibyte.
3131 * syntax.c (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
3132 unibyte chars to multibyte.
3133 (back_comment): Likewise.
3134 (scan_words): Likewise.
3135 (skip_chars): The arg syntaxp is deleted, and the code for
3136 handling syntaxes is moved to skip_syntaxes. Callers changed.
3137 Fix the case that the multibyteness of STRING and the current
3138 buffer doesn't match.
3139 (skip_syntaxes): New function.
3140 (SYNTAX_WITH_MULTIBYTE_CHECK): Check C by ASCII_CHAR_P, not by
3142 (Fforward_comment): Use FETCH_CHAR_AS_MULTIBYTE to convert unibyte
3144 (scan_lists): Likewise.
3145 (Fbackward_prefix_chars): Likewise.
3146 (scan_sexps_forward): Likewise.
3148 2002-08-23 Kenichi Handa <handa@m17n.org>
3150 * xfaces.c (QCfontset): New variable.
3151 (LFACE_FONTSET): New macro.
3152 (check_lface_attrs): Check also LFACE_FONTSET_INDEX.
3153 (set_lface_from_font_name): Setup LFACE_FONTSET (lface).
3154 (Finternal_set_lisp_face_attribute): Handle QCfontset.
3155 (Finternal_get_lisp_face_attribute): Likewise.
3156 (lface_same_font_attributes_p): Fix checking of LFACE_FONT_INDEX,
3157 check also LFACE_FONTSET_INDEX.
3158 (face_fontset): Check attrs[LFACE_FONTSET_INDEX], not
3159 attrs[LFACE_FONT_INDEX].
3160 (syms_of_xfaces): Intern and staticpro QCfontset.
3162 * dispextern.h (enum lface_attribute_index): New member
3163 LFACE_FONTSET_INDEX.
3165 * fns.c (base64_encode_1): Handle eight-bit chars correctly.
3167 2002-08-21 Kenichi Handa <handa@m17n.org>
3169 * coding.c (coding_set_destination): Fix coding->destination for
3170 the case converting a region.
3171 (encode_coding_utf_8): Encode eight-bit chars as single byte.
3172 (encode_coding_object): Fix coding->dst_pos and
3173 coding->dst_pos_byte for the case converting a region.
3175 * insdel.c (insert_from_gap): Make it work even if PT != GTP.
3177 * character.h (BYTE8_STRING): New macro.
3179 * fns.c (base64_decode_1): Insert eight-bit chars correctly.
3181 2002-08-20 Kenichi Handa <handa@m17n.org>
3183 * xdisp.c (get_next_display_element): Don't display unibyte 8-bit
3184 characters by octal form.
3186 * abbrev.c (Fexpand_abbrev): Fix for the multibyte case.
3188 * buffer.h (_fetch_multibyte_char_len): Extern deleted.
3189 (FETCH_MULTIBYTE_CHAR): Don't use _fetch_multibyte_char_len.
3190 (BUF_FETCH_MULTIBYTE_CHAR): Likewise.
3191 (FETCH_CHAR_AS_MULTIBYTE): New macro.
3193 * casetab.c (set_canon, set_identity, shuffle): Simplified.
3195 * casefiddle.c (casify_object): Simplified. Handle the case that
3196 the case conversion change the byte length.
3197 (casify_region): Likewise
3199 * character.h (MAKE_CHAR_UNIBYTE, MAKE_CHAR_MULTIBYTE): New
3202 * character.c (_fetch_multibyte_char_len): This variable deleted.
3203 (syms_of_character): Setup Vprintable_chars.
3205 * editfns.c (Fchar_equal): Fix for the unibyte case.
3206 (Finsert_byte): New function.
3207 (syms_of_editfns): Defsubr it.
3209 * keyboard.c (read_key_sequence): Use ~CHAR_MODIFIER_MASK instead
3210 of direct code 0x3ffff.
3212 * search.c (Freplace_match): Fix for the unibyte case.
3214 2002-08-19 Kenichi Handa <handa@m17n.org>
3216 * lread.c (safe_to_load_p): Fix the logic.
3218 * syntax.c (scan_words): Don't treat characters belonging to
3219 different scripts as constituting a word.
3221 * editfns.c (Fformat): Use ASCII_CHAR_P, not SINGLE_BYTE_CHAR_P.
3223 * fontset.c (Fset_fontset_font): Treat `ascii' as charset, not
3226 * emacs.c (main): In the case of --unibyte, instead of aborting on
3227 finding non-empty buffer, make it unibyte.
3229 2002-08-18 Kenichi Handa <handa@m17n.org>
3231 * xterm.c (x_new_fontset): Call `create-fontset-from-ascii-font'
3232 to create a fontset.
3234 2002-08-18 Dave Love <fx@gnu.org>
3236 * character.c (Funibyte_char_to_multibyte): Doc fix.
3238 * xfns.c [HAVE_STDLIB_H]: Fix last change.
3240 2002-08-15 Kenichi Handa <handa@m17n.org>
3242 * fontset.c (fontset_add): Make the type `int'.
3243 (fontset_id_valid_p): Define it if FONTSET_DEBUG is defined.
3245 * character.c (unibyte_char_to_multibyte): Refer to
3246 charset_unibyte, not charset_primary.
3247 (multibyte_char_to_unibyte): Likewise.
3248 (Funibyte_char_to_multibyte): Likewise.
3250 * charset.h: (charset_unibyte): Extern it instead of
3253 * charset.c (charset_unibyte): Renamed from charset_primary.
3254 (Funibyte_charset): Renamed from Fprimary_charset.
3255 (Fset_unibyte_charset): Renamed from Fset_primary_charset.
3256 (syms_of_charset): Adjusted for the above changes.
3258 * w32term.c (x_produce_glyphs): Use ASCII_CHAR_P, not
3259 SINGLE_BYTE_CHAR_P. Fix the logic of handling non-ASCII char when
3260 it->multibyte_p is zero.
3262 * lisp.h (nonascii_insert_offset, Vnonascii_translation_table):
3265 2002-08-08 Kenichi Handa <handa@m17n.org>
3267 * coding.c (Fdefine_coding_system_internal): Fix category setting
3268 for a coding system of type iso-2022.
3270 2002-08-02 Kenichi Handa <handa@m17n.org>
3272 * fontset.h (FS_LOAD_FONT): Call fs_load_font with the arg CHARSET
3275 2002-08-01 Kenichi Handa <handa@m17n.org>
3277 * syntax.c (Vnext_word_boundary_function_table): New variable.
3278 (syms_of_syntax): Declare it as a Lisp variable.
3279 (scan_words): Call functions in Vnext_word_boundary_function_table
3282 * xterm.c (x_load_font): Initialize fontp->fontset to -1.
3284 * fontset.c (fs_load_font): If fontp->charset is not negative,
3285 return fontp without setting its members.
3287 2002-07-31 Dave Love <fx@gnu.org>
3289 * config.in: Generated with autoheader.
3291 * xfns.c [HAVE_STDLIB_H]: Change logic (instead of fixing typo).
3293 * m/sparc.h (HAVE_ALLOCA): Delete.
3295 * s/irix6-5.h: Don't include strings.h.
3296 (bcopy, bzero, bcmp): Don't undef.
3298 * s/irix6-0.h (bcopy, bzero, bcmp): Don't undef.
3300 * s/usg5-4.h (NO_SIOCTL_H): Don't define.
3301 (TIOCSIGSEND): Don't test IRIX6.
3302 (bcopy, bzero, bcmp): Define conditionally.
3304 2002-07-31 Kenichi Handa <handa@m17n.org>
3306 * buffer.c (Qas, Qmake, Qto): New variables.
3307 (Fset_buffer_multibyte): New optional arg METHOD. Caller changed.
3308 (syms_of_buffer): Intern and staticpro Qas, Qmake, and Qto.
3310 * callproc.c (Fcall_process): Don't call insert_1_both directly if
3311 we are inserting a process output into a multibyte buffer.
3313 * character.h (CHAR_TO_BYTE8): If C is not eight-bit char, call
3314 multibyte_char_to_unibyte.
3316 * character.c (Funibyte_char_to_multibyte): If C can't be decoded
3317 by the primary charset, make it eight-bit char.
3318 (Fmultibyte_char_to_unibyte): Call CHAR_TO_BYTE8.
3320 * charset.c: (charset_eight_bit, Qeight_bit_control): New
3322 (charset_8_bit__control, charset_8_bit_graphic,
3323 Qeight_bit_control, Qeight_bit_graphic): These variables deleted.
3324 (define_charset_internal): New function.
3325 (syms_of_charset): Call define_charset_internal for pre-defined
3328 * charset.h (charset_8_bit): Extern it.
3330 * coding.c (make_conversion_work_buffer): Adjusted for the change
3331 of Fset_buffer_multibyte.
3332 (encode_coding_raw_text): Increment p0 in the loop.
3334 * lisp.h (Fset_buffer_multibyte): Prototype adjusted.
3336 * xdisp.c (setup_echo_area_for_printing, set_message_1): Adjusted
3337 for the change of Fset_buffer_multibyte.
3339 * fns.c (Fstring_to_multibyte): New function.
3340 (syms_of_fns): Declare Fstring_to_multibyte as Lisp subroutine.
3342 2002-07-30 Dave Love <fx@gnu.org>
3344 * xfns.c (x_put_x_image): Declare args.
3346 * xfaces.c (font_name_registry, choose_face_font): Delete unused
3348 (try_font_list): Declare an arg.
3350 * xdisp.c (message2_nolog, set_message): Declare an arg.
3352 * terminfo.c (tparam): Declare an arg. Use P_ to declare tparm.
3354 * syntax.c (scan_sexps_forward): Declare an arg.
3356 * scroll.c (calculate_scrolling, calculate_direct_scrolling):
3359 * lisp.h (Fnew_fontset): Declare.
3361 * keymap.c (push_key_description): Call CHARACTERP correctly.
3363 * fontset.c (fontset_add): Declare args. Call make_number
3365 (face_for_char): Delete unused vars.
3366 (Fset_fontset_font): Doc fix. Delete unused vars.
3368 * doc.c (Fsubstitute_command_keys): Delete unused vars.
3370 * composite.c (update_compositions): Declare arg.
3372 * cm.c (calccost, cmgoto): Declare args.
3374 * charset.c: Remove `emacs' conditional. Doc fixes.
3375 (map_char_table_for_charset): Declare.
3377 * character.c (syms_of_character) <translation-table-vector>: Doc
3380 * ccl.c: Remove `emacs' conditional. Include hash table stuff
3383 2002-07-26 Kenichi Handa <handa@m17n.org>
3385 The following changes are to allow specifying multiple font
3386 patterns for a character range (specified by script or charset).
3388 * Makefile.in (abbrev.o): Depend on syntax.h.
3389 (xfaces.o): Depend on charset.h.
3391 * alloc.c (Fmake_string): Use ASCII_CHAR_P, not
3394 * ccl.c (Fccl_execute_on_string): Add `const' to local variables.
3396 * character.h (Vchar_script_table): Extern it.
3398 * character.c (Vscript_alist): This variable deleted.
3399 (Vchar_script_table, Qchar_script_table): New variable.
3400 (syms_of_character): Declare Vchar_script_table as a lisp variable
3403 * chartab.c (Fmake_char_table): Doc fixed. If PURPOSE doesn't
3404 have property char-table-extra-slots, make no extra slot.
3406 * dispextern.h (struct face): Member `charset' deleted.
3407 (FACE_SUITABLE_FOR_CHAR_P): Use ASCII_CHAR_P, not
3409 (FACE_FOR_CHAR): Likewise.
3410 (choose_face_font, lookup_non_ascii_face, font_name_registry): Add
3412 (lookup_face, lookup_named_face, lookup_derived_face): Prototype
3414 (generate_ascii_font_name): Renamed from generate_ascii_font.
3416 * fontset.h (get_font_repertory_func): New prototype.
3417 (make_fontset_for_ascii_face, fs_load_font): Prototypes fixed.
3418 (FS_LOAD_FONT): Call fs_load_font with the 3rd arg charset_ascii.
3420 * fontset.c (Qprepend, Qappend): New variables.
3421 (FONTSET_CHARSET_ALIST, FONTSET_FACE_ALIST): These macros deleted.
3422 (FONTSET_NOFONT_FACE, FONTSET_REPERTORY): New macros.
3423 (FONTSET_REF): Optimize if FONTSET is Vdefault_fontset.
3424 (FONTSET_REF_AND_RANGE, FONTSET_ADD): New macros.
3425 (fontset_ref_and_range, fontset_add, reorder_font_vector)
3426 (load_font_get_repertory): New functions.
3427 (fontset_set): This function deleted.
3428 (fontset_face): New arg FACE. Return face ID, not face.
3429 Completely re-written to handle new fontset structure. Caller
3431 (free_face_fontset): Use ASET istead of AREF (X) = Y.
3432 (face_for_char): Don't call lookup_face.
3433 (make_fontset_for_ascii_face): New arg FACE.
3434 (fs_load_font): New arg CHARSET_ID. Don't check
3435 Vfont_encoding_alist here.
3436 (find_font_encoding): New function.
3437 (list_fontsets): Use STRINGP, not ! NILP.
3438 (accumulate_script_ranges): New function.
3439 (Fset_fontset_font, Fnew_fontset, Ffontset_info): Completely
3440 re-written to handle new fontset structure.
3441 (Ffontset_font): Return a copy of element.
3442 (syms_of_fontset): Define symbols Qprepend and Qappend. Fix
3443 docstring of font-encoding-alist.
3445 * lisp.h (CHAR_TABLE_REF): Remove unnecessary check (IDX >= 0).
3446 (Fset_fotset_font): Fix arguments to 5.
3448 * msdos.c (XMenuActivate): Adjuted for the change of
3449 lookup_derived_face.
3451 * xdisp.c (message_dolog, set_message_1, extend_face_to_end_of_line):
3452 Use ASCII_CHAR_P, not SINGLE_BYTE_CHAR_P.
3453 (highlight_trailing_whitespace): Adjusted for the change of
3456 * xfaces.c: Include charset.h.
3457 (load_face_font): Argument C deleted. Caller changed.
3458 (generate_ascii_font_name): Renamed from generate_ascii_font.
3459 (font_name_registry): New function.
3460 (cache_face): Store ascii faces before non-ascii faces in buckets.
3461 (lookup_face): Arguments C and BASE_FACE deleted. Caller changed.
3462 Lookup only ascii faces.
3463 (lookup_non_ascii_face): New function.
3464 (lookup_named_face): Argument C deleted. Caller changed.
3465 (lookup_derived_face): Argument C deleted. Caller changed.
3466 (try_font_list): New arg PATTERN. Caller changed. If PATTERN is
3467 a string, just call font_list with it.
3468 (choose_face_font): Arguments FACE and C deleted. New arg
3469 FONT_SPEC. Caller changed.
3470 (realize_face): Arguments C and BASE_FACE deleted. Caller
3471 (realize_x_face): Likewise.
3472 (realize_non_ascii_face): New function.
3473 (realize_x_face): Call load_face_font here.
3474 (realize_tty_face): Argument C deleted. Caller changed.
3475 (compute_char_face): If CH is not ascii, call FACE_FOR_CHAR to
3477 (dump_realized_face): Don't print charset of FACE.
3479 * xfns.c (x_set_font): Always call x_new_fontset and
3480 store_frame_parameter.
3481 (Fx_create_frame): Call x_new_fontset, not x_new_font.
3482 (syms_of_xfns): Set get_font_repertory_func to
3483 x_get_font_repertory.
3485 * xterm.h (x_get_font_repertory): Extern it.
3487 * xterm.c (x_produce_glyphs): Use ASCII_CHAR_P, not
3488 SINGLE_BYTE_CHAR_P. Fix the logic of handling non-ASCII char when
3489 it->multibyte_p is zero.
3490 (XTread_socket): Use ASCII_CHAR_P, not SINGLE_BYTE_CHAR_P.
3491 (x_new_fontset): If FONTSETNAME doesn't match any existing
3492 fontsets, create a new one.
3493 (x_get_font_repertory): New function.
3495 2002-07-25 Kenichi Handa <handa@m17n.org>
3497 * coding.c (Ffind_coding_systems_region_internal): Detect an
3498 ASCII only string correctly.
3500 * lread.c (Fload): Don't load with Qload_force_doc_strings t if
3503 2002-07-24 Kenichi Handa <handa@m17n.org>
3505 * lread.c: Include "coding.h".
3506 (Qget_emacs_mule_file_char, Qload_force_doc_strings,
3507 load_each_byte, unread_char): New variables.
3508 (readchar_backlog): This variable deleted.
3509 (readchar): Return a character unless load_each_byte is nonzero.
3510 Handle the case that readcharfun is Qget_emacs_mule_file_char or a
3511 cons. If unread_char is not -1, simply return it.
3512 (unreadchar): Handle the case that readcharfun is
3513 Qget_emacs_mule_file_char or a cons. Set unread_char if
3515 (read_multibyte): This function deleted.
3516 (readbyte_for_lambda, readbyte_from_file, readbyte_from_string)
3517 (read_emacs_mule_char): New functions.
3518 (Fload): Even if the file doesn't have the extention ".elc", if
3519 safe_to_load_p returns a positive version number, assume that the
3520 file contains bytecompiled code. If the version is less than 22,
3521 load the file while decoding multibyte sequences by emacs-mule.
3522 (readevalloop): Don't use readchar_backlog.
3523 (Fread): Likewise. Pay attention to the case that STREAM is a
3525 (Fread_from_string): Pay attention to the case that STREAM is a
3527 (read_escape): The arg BYTEREP deleted.
3528 (read1): Set load_each_byte to 1 temporarily while handling
3529 #@NUMBER. Don't call read_multibyte.
3530 (read_vector): Call Fread with a cons. If readcharfun is
3531 Qget_emacs_mule_file_char, decode the read string by emacs-mule.
3532 (read_list): If doc_reference is 2, make the cdr part string as
3534 (syms_of_lread): Intern and staticpro Qget_emacs_mule_file_char
3535 and Qload_force_doc_strings.
3537 2002-07-23 Kenichi Handa <handa@m17n.org>
3539 * xdisp.c (face_before_or_after_it_pos): Call
3540 FETCH_MULTIBYTE_CHAR with byte postion, not char position.
3542 2002-07-22 Kenichi Handa <handa@m17n.org>
3544 * character.h (TRAILING_CODE_P): New macro.
3545 (MAYBE_UNIFY_CHAR): Adjusted for the change of Funify_charset.
3546 (string_char_with_unification): Fix prototype.
3547 (Vscript_alist): Extern it.
3549 * character.c (Vscript_alist): New variable.
3550 (string_char_with_unification): Add `const' to local variables.
3551 (str_as_unibyte): Likewise.
3552 (string_escape_byte8): Likewise.
3553 (syms_of_character): Declare script-alist as a Lisp variable.
3555 * charset.h (Vcharset_ordered_list): Extern it.
3556 (charset_ordered_list_tick): Extern it.
3557 (EMACS_MULE_LEADING_CODE_PRIVATE_11)
3558 (EMACS_MULE_LEADING_CODE_PRIVATE_12)
3559 (EMACS_MULE_LEADING_CODE_PRIVATE_21)
3560 (EMACS_MULE_LEADING_CODE_PRIVATE_22): New macros
3561 (Funify_charset): Adjusted for the change of Funify_charset.
3563 * charset.c (charset_ordered_list_tick): New variable.
3564 (Fdefine_charset_internal): Increment charset_ordered_list_tick.
3565 (Funify_charset): New optional arg DEUNIFY. If it is non-nil,
3566 deunify intead of unify a charset.
3567 (string_xstring_p): Add `const' to local variables.
3568 (find_charsets_in_text): Add `const' to arguemnts and local
3570 (encode_char): Adjusted for the change of Funify_charset. Fix
3571 detecting of invalid code.
3572 (Fset_charset_priority): Increment charset_ordered_list_tick.
3573 (Fmap_charset_chars): Fix handling of default value for FROM_CODE
3576 * coding.c (LEADING_CODE_PRIVATE_11, LEADING_CODE_PRIVATE_12)
3577 (LEADING_CODE_PRIVATE_21, LEADING_CODE_PRIVATE_22): Macros
3578 deleted. Callers changed to use
3579 EMACS_MULE_LEADING_CODE_PRIVATE_11, etc.
3580 (decode_coding_ccl): Add `const' to local variables.
3581 (consume_chars): Likewise.
3582 (Ffind_coding_systems_region_internal): Likewise.
3583 (Fcheck_coding_systems_region): Likewise.
3585 * print.c (print_object): Use octal form for printing the
3586 contents of a bool vector.
3588 2002-07-18 Dave Love <fx@gnu.org>
3590 * lread.c (Fload) <!load_dangerous_libraries>: Don't leak fd.
3591 <version == 20>: Refuse to load.
3593 2002-07-17 Dave Love <fx@gnu.org>
3595 * fns.c: Move coding.h.
3596 (Qcodeset, Qdays, Qmonths): New.
3597 (concat): Use CHARACTERP instead of INTERGERP.
3598 (Flocale_codeset): Deleted.
3599 (Flanginfo): New function.
3600 (syms_of_fns): Changed accordingly.
3602 * coding.c (adjust_coding_eol_type): Fix eol_type/eol_seen mixup.
3604 2002-07-16 Dave Love <fx@gnu.org>
3606 * casetab.c (init_casetab_once, init_casetab_once): Fix
3607 CHAR_TABLE_SET call.
3609 * category.c (Fmodify_category_entry): Fix CATEGORY_MEMBER call.
3611 * character.c (syms_of_character): Fix CHAR_TABLE_SET call.
3613 * charset.c (Fmap_charset_chars): Check args. Convert Lisp types.
3614 (load_charset_map, Fdeclare_equiv_charset, Fencode_char)
3615 (Fset_charset_priority, syms_of_charset): Convert Lisp types.
3617 * charset.h (CHECK_CHARSET_GET_ID): Use XINT on AREF result.
3619 * coding.c (ENCODE_DESIGNATION, decode_eol)
3620 (make_conversion_work_buffer, code_conversion_restore)
3621 (Fdefine_coding_system_internal): Convert Lisp types.
3622 (code_conversion_restore): Use EQ, not ==.
3623 (Fencode_coding_string): Fix code_convert_string call.
3625 * coding.h (code_convert_region): Fix prototype.
3627 * dispextern.h (redraw_frame, redraw_garbaged_frames): Removed.
3629 * fontset.c (fontset_ref, fontset_set, fs_load_font)
3630 (Ffontset_info): Convert Lisp types.
3632 * syntax.h (SYNTAX_ENTRY_INT): Don't use make_number.
3634 * xterm.c (note_mouse_movement): Fix call of window_from_coordinates.
3636 * xdisp.c (display_mode_element): Fix call of Fset_text_properties.
3638 * chartab.c: Include "...h", not <...h> in some cases.
3640 * callproc.c (Fcall_process): Remove unused variables.
3642 2002-07-12 Dave Love <fx@gnu.org>
3644 * coding.c (Fset_coding_system_priority): Allow null arg list.
3646 2002-07-03 Dave Love <fx@gnu.org>
3648 * minibuf.c (Fminibuffer_complete_word): Remove unused var.
3649 (Fself_insert_and_exit): Use CHARACTERP.
3651 * callproc.c (Fcall_process): Remove unused vars.
3653 * xterm.c (XTread_socket): Add extra dead keysyms.
3655 * xdisp.c (decode_mode_spec_coding): Use CHARACTERP.
3657 * dispextern.h: Remove prototypes for redraw_frame,
3658 redraw_garbaged_frames.
3660 * cmds.c (Fself_insert_command): Use CHARACTERP.
3662 * chartab.c (make_sub_char_table): Remove unused var.
3663 (Fset_char_table_default, Fmap_char_table): Doc fix.
3665 * keymap.c (access_keymap): Remove generic char code.
3666 (push_key_description): Use CHARACTERP.
3668 2002-07-01 Dave Love <fx@gnu.org>
3670 * charset.c: Doc fixes.
3671 (Funify_charset): Extra checking.
3673 2002-06-24 Dave Love <fx@gnu.org>
3675 * lread.c: Remove some unused variables.
3676 (safe_to_load_p): If safe, return the magic number version byte.
3677 (Fload): Maybe use load-with-code-conversion.
3679 2002-06-12 Kenichi Handa <handa@m17n.org>
3681 * category.c (Fmodify_category_entry): Don't modify the contents
3682 of category_set for characters out of the range. Avoid
3683 unnecessary modification.
3685 * character.h (MAYBE_UNIFY_CHAR): Adjusted for the change of
3686 Vchar_unify_table. The default value of the table is now nil.
3688 * character.c (syms_of_character): Setup Vchar_width_table for
3689 eight-bit-control and raw-byte chars.
3691 * charset.h (enum define_charset_arg_index): Delete
3692 charset_arg_parents and add charset_arg_subset and
3693 charset_arg_superset.
3694 (enum charset_attr_index): Delete charset_parents and add
3695 charset_subset and charset_superset.
3696 (enum charset_method): Delete CHARSET_METHOD_INHERIT and add
3697 CHARSET_METHOD_SUBSET and CHARSET_METHOD_SUPERSET.
3698 (CHARSET_ATTR_PARENTS, CHARSET_PARENTS): Macros deleted.
3699 (CHARSET_ATTR_SUBSET, CHARSET_ATTR_SUPERSET, CHARSET_SUBSET)
3700 (CHARSET_SUPERSET): New macros.
3701 (charset_work): Extern it.
3702 (ENCODE_CHAR): Use charset_work.
3703 (CHAR_CHARSET_P): Adjusted for the change of encoder format.
3704 (map_charset_chars): Extern it.
3706 * charset.c (load_charset_map): Set the default value of encoder
3707 and deunifier char-tables to nil.
3708 (map_charset_chars): Argument changed. Callers changed. Use
3709 map_char_table_for_charset instead of map_char_table.
3710 (Fmap_charset_chars): New optional args from_code and to_code.
3711 (Fdefine_charset_internal): Adjusted for the change of
3712 `define-charset' (:parents -> :subset or :superset).
3713 (charset_work): New variable.
3714 (encode_char): Adjusted for the change of
3715 Fdefine_charset_internal.
3716 (syms_of_charset): Likewise.
3717 (Ffind_charset_string): Setup the vector `charsets' correctly.
3719 * chartab.c (sub_char_table_ref_and_range): New arg defalt. Fix
3720 the previous change.
3721 (char_table_ref_and_range): Adjusted for the above change.
3722 (map_sub_char_table_for_charset): New function.
3723 (map_char_table_for_charset): New function.
3725 * keymap.c (describe_vector): Handle a char-table directly here.
3726 (describe_char_table): Deleted.
3728 * lisp.h (map_charset_chars): Deleted.
3730 2002-06-11 Dave Love <fx@gnu.org>
3732 * fns.c (count_combining): Comment out (unused).
3733 (Flocale_codeset): New.
3734 (syms_of_fns): Defsubr it.
3736 * config.in (HAVE_PTY_H, HAVE_SIZE_T, HAVE_LANGINFO_CODESET): New.
3739 2002-06-06 Dave Love <fx@gnu.org>
3741 * Makefile.in (chartab.o): Depend on charset.h
3743 2002-06-03 Kenichi Handa <handa@m17n.org>
3745 * character.c (syms_of_character): Set the default value of
3746 Vprintable_chars to Qnil.
3748 2002-05-31 Dave Love <fx@gnu.org>
3750 * Makefile.in (lisp, shortlisp): Change indian.elc to indian.el.
3752 2002-05-31 Kenichi Handa <handa@m17n.org>
3754 * charset.c (load_charset_map): Handle the case that from < to
3757 * coding.c (encode_coding_emacs_mule): Pay attention to raw-8-bit
3759 (encode_coding_iso_2022): Likewise.
3760 (encode_coding_sjis): Likewise.
3761 (encode_coding_big5): Likewise.
3762 (encode_coding_charset): Likewise.
3764 2002-05-30 Kenichi Handa <handa@m17n.org>
3766 * Makefile.in (lisp): Change chinese.elc to chinese.el. They are
3767 not bytecompiled now.
3768 (shortlisp): Likewise.
3770 * charset.c (charset_jisx0201_roman, charset_jisx0208_1978)
3771 (charset_jisx0208): New variables.
3772 (Fdefine_charset_internal): Setup them if appropriate.
3773 (init_charset_once): Initialize them to -1.
3775 * charset.h (charset_jisx0201_roman, charset_jisx0208_1978,
3776 charset_jisx0208): Extern them.
3778 * coding.c (CODING_ISO_FLAG_USE_ROMAN): New macro
3779 (CODING_ISO_FLAG_USE_OLDJIS): New macro.
3780 (CODING_ISO_FLAG_FULL_SUPPORT): Macro definition changed.
3781 (setup_iso_safe_charsets): Fix arguemtns to Fassq.
3782 (DECODE_DESIGNATION): Pay attention to CODING_ISO_FLAG_USE_ROMAN
3783 and CODING_ISO_FLAG_USE_OLDJIS.
3784 (ENCODE_ISO_CHARACTER_DIMENSION1): Likewise.
3785 (ENCODE_ISO_CHARACTER_DIMENSION2): Likewise.
3786 (encode_coding_iso_2022): Change the 1st arg to
3787 ENCODE_ISO_CHARACTER to a variable.
3789 2002-05-29 Kenichi Handa <handa@m17n.org>
3791 * charset.h (enum define_charset_arg_index): New enums
3792 charset_arg_min_code and charset_arg_max_code.
3793 (struct charset): New member char_index_offset.
3795 * charset.c (CODE_POINT_TO_INDEX): Take charset->char_index_offset
3797 (INDEX_TO_CODE_POINT): Likewise.
3798 (Fdefine_charset_internal): Handle args[charset_arg_min_code] and
3799 args[charset_arg_max_code]. Setup charset.char_index_offset.
3800 (syms_of_charset): Fix args to Fdefine_charset_internal.
3802 2002-05-27 Dave Love <fx@gnu.org>
3804 * coding.c (decode_coding_utf_8): Reject overlong sequences.
3806 2002-05-26 Dave Love <fx@gnu.org>
3808 * coding.c: Doc fixes.
3809 (Fcoding_system_aliases): Fix return value.
3810 (Qmac): Remove (duplicated) definition.
3812 2002-05-25 Dave Love <fx@gnu.org>
3814 * charset.c (Fcharset_priority_list, Fset_charset_priority): New
3817 * character.c (Fstring): Doc fix.
3819 * charset.c (Fdefine_charset_alias): Update Vcharset_list.
3821 * fontset.c (Ffontset_info): Doc fix. Return charset names, not
3823 (font-encoding-alist): Doc fix.
3825 2002-05-24 Dave Love <fx@gnu.org>
3827 * term.c (costs_set): Declare static, non-initialized for pcc.
3828 (encode_terminal_code): Remove ensued var.
3830 * keyboard.c (kbd_buffer_store_event): Fix interrupt_signal decl
3833 * xterm.c (xlwmenu_window_p): Fix prototype for K&R.
3835 * coding.c (setup_iso_safe_charsets): Fix arg decl for K&R.
3836 (suffixes): Moved out of make_subsidiaries for K&R.
3838 * charset.c (map_charset_chars): Fix c_function declaration for
3841 * lisp.h (DEFUN) [!PROTOTYPES]: Remove spurious `args'.
3843 2002-05-23 Dave Love <fx@gnu.org>
3845 * data.c (Fchar_or_string_p): Doc fix. Use CHARACTERP.
3847 * category.c (Fmodify_category_entry): Doc fix. Remove unused
3850 2002-05-23 Yong Lu <lyongu@asia-infonet.com>
3852 * charset.c (Fdefine_charset_internal): Fix argument to bzero.
3854 * coding.c (Fdefine_coding_system_internal): Fix previous change.
3855 (decode_coding_charset): Workaround for the bug of GCC 2.96.
3857 2002-05-23 Kenichi Handa <handa@m17n.org>
3859 * Makefile.in (lisp): Change cyrillic.elc to cyrillic.el,
3860 vietnamese.elc to vietnamese.el. They are not bytecompiled now.
3861 (shortlisp): Likewise.
3863 2002-05-22 Kenichi Handa <handa@m17n.org>
3865 * coding.c (decode_coding_charset): Adjusted for the change of
3866 Fdefine_coding_system_internal.
3867 (Fdefine_coding_system_internal): For a coding system of
3868 `charset' type, store a list of charset IDs in
3869 `charset_attr_charset_valids' element of coding attributes.
3871 * charset.c (Fmake_char): Fix previous change.
3873 2002-05-21 Kenichi Handa <handa@m17n.org>
3875 * coding.c (ONE_MORE_BYTE_NO_CHECK): Increment consumed_chars.
3876 (emacs_mule_char): New arg src. Delete arg `composition'. Caller
3877 changed. Handle 2-byte and 3-byte charsets correctly.
3878 (DECODE_EMACS_MULE_COMPOSITION_RULE_20): Renamed from
3879 DECODE_EMACS_MULE_COMPOSITION_RULE. Caller changed.
3880 (DECODE_EMACS_MULE_COMPOSITION_RULE_21): New macro.
3881 (DECODE_EMACS_MULE_21_COMPOSITION): Call
3882 DECODE_EMACS_MULE_COMPOSITION_RULE_21. Produce correct annotation
3884 (decode_coding_emacs_mule): Handle composition correctly. Rewind
3885 `src' and `consumed_chars' correctly before calling
3887 (DECODE_COMPOSITION_START): Correctly handle the case of altchar
3888 and alt&rule composition.
3889 (decode_coding_iso_2022): Handle composition correctly.
3890 (init_coding_once): Setup emacs_mule_bytes for private charsets.
3892 * charset.c (Fdefine_charset_internal): Fix bug for the case of
3893 re-defining a charset. If the charset has :emacs-mule-id, setup
3895 (Fmake_char): If CODE1 is nil, use the minimum code of the
3898 2002-05-20 Kenichi Handa <handa@m17n.org>
3900 * coding.c (encode_coding_iso_2022): If coding requires safe
3901 encoding, produce a character specified by
3902 CODING_INHIBIT_CHARACTER_SUBSTITUTION.
3903 (encode_coding_sjis): Likewise.
3904 (encode_coding_big5): Likewise.
3905 (encode_coding_charset): Likewise.
3907 2002-05-17 Dave Love <fx@gnu.org>
3909 * xterm.c (XSetIMValues): Declare.
3911 * process.c: Conditionally include sys/wait.h, pty.h.
3913 * print.c (print_object): Fix print format for 64-bit
3916 * keyboard.c (modify_event_symbol): Fix print format for 64-bit
3919 * buffer.c (emacs_strerror): Declare.
3920 (MMAP_ALLOCATED_P, mmap_enlarge, syms_of_buffer): Import changes
3923 * fontset.c (Fclear_face_cache): Declare.
3924 (accumulate_font_info): Commented-out (unused).
3925 (face_for_char, Fset_fontset_font, Ffontset_info): Remove unused
3928 * character.h (string_escape_byte8): Declare.
3930 * charset.c (load_charset_map, load_charset_map_from_file): Remove
3932 (Fdefine_charset_internal, Fsplit_char, syms_of_charset)
3933 (Fmap_charset_chars): Doc fix.
3935 * coding.c (Vchar_coding_system_table, Qchar_coding_system):
3937 (Fset_coding_system_priority, Fset_coding_system_priority)
3938 (Fdefine_coding_system_internal): Doc fix.
3940 2002-05-16 Dave Love <fx@gnu.org>
3942 * s/osf5-0.h (C_SWITCH_SYSTEM) [!__GNUC__]: Remove -nointrinsics.
3944 2002-05-16 Kenichi Handa <handa@m17n.org>
3946 * character.c (string_escape_byte8): Make multibyte string with
3949 * charset.c (Fmake_char): Delete unnecessary code.
3951 2002-05-14 Kenichi Handa <handa@m17n.org>
3953 * xfns.c (x_encode_text): Allocate coding.destination here, and
3954 call encode_coding_object with dst_object Qnil.
3956 * buffer.c (Fset_buffer_multibyte): Convert 8-bit bytes to
3957 multibyte form correctly.
3959 * fontset.c (fs_load_font): Check fontp->full_name (not fontname)
3960 against Vfont_encoding_alist.
3962 * coding.c (Fdecode_sjis_char): Fix typo (0x7F->0xFF). Fix the
3963 handling of charset list.
3964 (encode_coding_iso_2022): Setup coding->safe_charsets in advance.
3965 (decode_coding_object): Move point to coding->dst_pos before
3966 calling post-read-conversion function.
3967 (encode_coding_object): Give correct arguments to
3968 pre-write-conversion. Ignore the return value of
3969 pre-write-conversion function. Pay attention to the case that
3970 pre-write-conversion changes the current buffer. If dst_object is
3971 Qt, even if coding->src_bytes is zero, allocate at least one byte
3972 to coding->destination.
3974 * coding.h (JIS_TO_SJIS): Fix typo (j1->s1, j2->s2).
3976 * charset.c (Fmake_char): Make it more backward compatible.
3977 (Fmap_charset_chars): Fix docstring.
3979 2002-05-13 Dave Love <fx@gnu.org>
3981 * coding.c: Doc fixes.
3982 (Fdefine_coding_system_alias): Use names, not symbols, in
3983 coding-system-alist.
3985 2002-05-13 Kenichi Handa <handa@m17n.org>
3987 * fontset.c (free_realized_fontsets): Call Fclear_face_cache instead
3988 of calling free_realized_face.
3990 2002-05-10 Yong Lu <lyongu@asia-infonet.com>
3992 * charset.c (load_charset_map): Fix previous change.
3993 (read_hex): Don't treat SPC as a comment starter.
3994 (decode_char): If CODE_POINT_TO_INDEX retruns -1, always return
3996 (Fdecode_char): Fix typo.
3998 2002-05-10 Kenichi Handa <handa@m17n.org>
4000 * charset.h (struct charset): New member `code_space_mask'.
4002 * coding.c (coding_set_source): Delete the local variable
4004 (encode_coding_charset): Delete the local variable charset.
4005 (Fdefine_coding_system_internal): Likewise.
4006 (Fdefine_coding_system_internal): Setup
4007 attrs[coding_attr_charset_valids] correctly.
4009 * charset.c (CODE_POINT_TO_INDEX): Utilize `code_space_mask'
4010 member to check if CODE is valid or not.
4011 (Fdefine_charset_internal): Initialize `code_space_mask' member.
4012 (encode_char): Before calling CODE_POINT_TO_INDEX, check if CODE
4013 is within the range of charset->min_code and carset->max_code.
4015 2002-05-09 Dave Love <fx@gnu.org>
4017 * syntax.h (syntax_temp) [!__GNUC__]: Declare.
4019 * dispextern.h (generate_ascii_font): Fix return type.
4021 * xfaces.c (generate_ascii_font): Fix arg declaration.
4023 * coding.c (coding_inherit_eol_type)
4024 (Fset_terminal_coding_system_internal)
4025 (Fset_safe_terminal_coding_system_internal): Fix arg declarations.
4027 2002-05-08 Kenichi Handa <handa@m17n.org>
4029 * coding.c (decode_coding_charset, encode_coding_charset): Handle
4030 multiple charsets correctly.
4032 2002-05-07 Kenichi Handa <handa@m17n.org>
4034 * search.c (boyer_moore): Fix handling of mulitbyte character
4037 * xdisp.c (display_mode_element): When the variable `elt' is
4038 changed, update `this' and `lisp_string'.
4040 2002-05-07 Kenichi Handa <handa@m17n.org>
4042 * buffer.c (Fset_buffer_multibyte): Fix 8-bit char handling.
4044 * callproc.c (Fcall_process): Be sure to give the current buffer
4045 to decode_coding_c_string. Update PT and PT_BYTE after the
4048 * charset.c (struct charset_map_entries): New struct.
4049 (load_charset_map): Renamed from parse_charset_map. New args
4050 entries and n_entries. Caller changed.
4051 (load_charset_map_from_file): Renamed from load_charset_map.
4052 Caller changed. New arg control_flag. Call load_charset_map at
4054 (load_charset_map_from_vector): New function.
4055 (Fdefine_charset_internal): Setup charset.compact_codes_p.
4056 (encode_char): If the charset is compact, change a character index
4059 * coding.c (coding_alloc_by_making_gap): Check the case that the
4060 source and destination are the same correctly.
4061 (decode_coding_raw_text): Set coding->consumed_char and
4062 coding->consumed to 0.
4063 (produce_chars): If coding->chars_at_source is nonzero, update
4064 coding->consumed_char and coding->consumed before calling
4066 (Fdefine_coding_system_alias): Register ALIAS in
4067 Vcoding_system_alist.
4068 (syms_of_coding): Define `no-convesion' coding system at the tail.
4070 * fileio.c (Finsert_file_contents): Set coding_system instead of
4071 val. If the current buffer is multibyte, always call
4074 * xfaces.c (try_font_list): Give higher priority to fontset's
4075 family than face's family.
4077 2002-04-18 Kenichi Handa <handa@m17n.org>
4079 * callproc.c (Fcall_process): Be sure to give the current buffer
4080 to decode_coding_c_string.
4082 * xfaces.c (try_font_list): Give a family specified in a fontset
4083 higher priority than a family specified in a face.
4085 2002-04-09 Kenichi Handa <handa@m17n.org>
4087 * fileio.c (Finsert_file_contents): Fix calculation of `inserted'.
4088 Fix arguments to insert_from_buffer.
4090 * xdisp.c (display_mode_element): Fix calculation of `bytepos'.
4092 2002-03-11 Kenichi Handa <handa@m17n.org>
4094 * coding.c (produce_chars): Set the variable `multibytep' correctly.
4095 (decode_coding_gap): Set coding->dst_multibyte correctly.
4097 2002-03-07 Kenichi Handa <handa@m17n.org>
4099 * coding.c (encode_coding_utf_8): Initialize produced_chars to 0.
4100 (decode_coding_utf_16): Fix converting high and low bytes to
4102 (encode_coding_utf_16): Substitute coding->default_char for
4103 non-Unicode characters.
4104 (decode_coding): Don't call record_insert here.
4105 (setup_coding_system): Initialize `surrogate' of
4106 coding->spec.utf_16 to 0.
4107 (EMIT_ONE_BYTE): Fix for multibyte case.
4109 * insdel.c (insert_from_gap): Call record_insert.
4111 2002-03-04 Kenichi Handa <handa@m17n.org>
4113 * casefiddle.c (casify_region): Fix multibyte case.
4115 * character.c (c_string_width): Add return type `int'.
4116 (char_string_with_unification): Arg ADVANCED deleted.
4118 * character.h (CHAR_VALID_P): Don't call CHARACTERP.
4119 (CHAR_STRING): Adjusted for the change of
4120 char_string_with_unification.
4121 (CHAR_STRING_ADVANCE): Make it do-while statement.
4123 * chartab.c (sub_char_table_set_range): Optimized for the case
4124 DEPTH == 3. Add workaround code for a GCC optimization bug.
4126 * charset.c (parse_charset_map): Remove an unused variable.
4128 * coding.c: Delete unused variables.
4130 * fileio.c (Finsert_file_contents): Set coding_system to Qnil
4131 earlier. If inserted is zero and the coding system doesn't
4132 require flushing, don't call decode_coding_gap.
4134 * syntax.h (SET_RAW_SYNTAX_ENTRY): Don't call make_number.
4136 2002-03-01 Kenichi Handa <handa@m17n.org>
4138 The following changes are for using Unicode as an internal
4139 character model, and use UTF-8 format for buffer/string
4142 * .gdbinit (xchartable): Adjusted for the change of char table
4144 (xsubchartable, xcoding, xcharset, xcurbuf): New commands.
4146 * Makefile.in (obj): Add character.o and chartab.o.
4147 (lisp, shortlisp): Remove utf-8.elc:
4148 (*.o): For many files, change dependency on charset.h to
4149 character.h, and add dependency on character.h.
4150 (character.o, chartab.o): New targets.
4152 * abbrev.c, bytecode.c, casefiddle.c, cmds.c, dispnew.c, doc.c,
4153 doprnt.c, dosfns.c, frame.c, marker.c, minibuf.c, msdos.c,
4154 w16select.c, w32bdf.c, w32console.c: Include "character.h" instead
4157 * dired.c, filelock.c: Include "character.h".
4159 * alloc.c: Include "character.h" instead of "charset.h".
4160 (Fmake_char_table): Moved to chartab.c.
4161 (make_sub_char_table): Likewise.
4162 (syms_of_alloc): Remove defsubr for Smake_char_table.
4164 * buffer.c: Include "character.h" instead of "charset.h", don't
4166 (Fset_buffer_multibyte): Adjuted for UTF-8.
4168 * buffer.h: EXFUN Fbuffer_live_p.
4170 * callproc.c: Include "character.h" instead of "charset.h".
4171 (Fcall_process): Big change for the new code-conversion APIs.
4173 * casetab.c: Include "character.h" instead of "charset.h".
4174 (set_canon, set_identity, shuffle): Adjusted for the new
4175 map_char_table spec.
4176 (init_casetab_once): Call CHAR_TABLE_SET instead of directly
4177 accessing the char table structure.
4179 * chartab.c: New file that implements char table.
4181 * category.c: Include "character.h".
4182 (copy_category_entry): New function.
4183 (copy_category_table): Call map_char_table and copy_category_entry.
4184 (Fmake_category_table): Initialize all top-vel slots.
4185 (char_category_set): New function.
4186 (modify_lower_category_set): Deleted.
4187 (Fmodify_category_entry): Call char_table_ref_and_range.
4189 * category.h (CATEGORY_SET): Just call char_category_set.
4191 * ccl.c: Include "character.h".
4192 (Qccl, Qcclp): New variables.
4193 (CCL_WRITE_CHAR): Alway treat the arg CH as a character even if
4195 (CCL_WRITE_MULTIBYTE_CHAR): Deleted.
4196 (CCL_WRITE_STRING, CCL_READ_CHAR): Adjusted for the change of SRC
4198 (ccl_driver): Types of arguments changed. Code adjusted for that.
4199 (Fccl_execute, Fccl_execute_on_string): Adjusted for the change of
4201 (syms_of_ccl): Intern and staticpro Qccl and Qcclp.
4203 * ccl.h (struct ccl_program): Members eol_type and multibyte
4204 deleted. New members src_multibyte, dst_multibyte, consumed, and
4206 (struct ccl_spec): Members decoder and encoder deleted. New
4208 (CODING_SPEC_CCL_PROGRAM): New macro.
4209 (ccl_driver): Prototype updated.
4210 (Qccl, Qcclp, Fccl_program_p): Extern them.
4211 (CHECK_CCL_PROGRAM): New macro.
4213 * character.c, character.h, chartab.c: New files.
4215 * charset.c: Mostly re-written. Character and multibyte sequence
4216 handling codes are moved to character.c.
4218 * charset.h: Mostly re-written. Character and multibyte sequence
4219 handling codes are moved to character.h.
4221 * coding.c, coding.h: Mostly re-written.
4223 * composite.c: Include "character.h" instead of "charset.h".
4224 (CHAR_WIDTH): Moved to character.h.
4225 (HASH_KEY, HASH_VALUE): Deleted.
4227 * composite.h (enum composition_method): Order of enumeration
4230 * data.c: Include "character.h" instead of "charset.h".
4231 (Faref): Call CHAR_TABLE_REF for a char table.
4232 (Faset): Call CHAR_TABLE_SET for a char table.
4234 * dispextern.h (free_realized_face, check_face_attribytes,
4235 generate_ascii_font): Extern them.
4236 (free_realized_multibyte_face): Extern deleted.
4238 * disptab.h (DISP_CHAR_VECTOR): Adjusted for the change of char
4241 * editfns.c: Include "character.h" instead of "charset.h".
4242 (Fchar_to_string): Always call CHAR_STRING.
4244 * emacs.c (main): Call init_charset_once, init_charset,
4245 syms_of_chartab, and syms_of_character.
4247 * fileio.c: Include "character.h" instead of "charset.h".
4248 (Finsert_file_contents): Big change for the new code-conversion
4250 (choose_write_coding_system): Likewise.
4251 (Fwrite_region): Likewise.
4252 (build_annotations_2): Deleted.
4253 (e_write): Big change for the new code-conversion API.
4255 * fns.c: Include "character.h" instead of "charset.h".
4256 (copy_sub_char_table): Moved to chartab.c.
4257 (Fcopy_sequence): Call copy_char_table for a char table.
4258 (concat): Delete codes calling count_multibyte.
4259 (string_char_to_byte): Adjusted for the new multibyte form.
4260 (string_byte_to_char): Likewise.
4261 (internal_equal): Adjusted for the change of char table structure.
4262 (Fchar_table_subtype, Fchar_table_parent, Fset_char_table_parent,
4263 Fchar_table_extra_slot, Fset_char_table_extra_slot,
4264 Fchar_table_range, Fset_char_table_range, Fset_char_table_default,
4265 char_table_translate, optimize_sub_char_table,
4266 Foptimize_char_table, map_char_table, Fmap_char_table): Moved to
4268 (char_table_ref_and_index): Deleted.
4269 (HASH_KEY, HASH_VALUE): Moved to lisp.h.
4270 (Fmd5): Call preferred_coding_system instead of accessing
4271 Vcoding_category_list. Adjusted for the new code-conversion API.
4272 (syms_of_fns): Defsubr for char table related functions moved to
4275 * fontset.c: Mostly re-written.
4277 * fontset.h (struct font_info): Type of the member encoding_type
4279 (enum FONT_SPEC_INDEX): New enum.
4280 (fontset_font_pattern, fs_load_font): Prototype updated.
4281 (FS_LOAD_FONT): Adjusted for the change of fs_load_font.
4283 * indent.c: Include "character.h" instead of "charset.h".
4284 (MULTIBYTE_BYTES_WIDTH): Call CHAR_WIDTH instead of
4287 * insdel.c: Include "character.h" instead of "charset.h".
4288 (copy_text): Don't refer to Vnonascii_translation_table.
4289 (insert_from_gap): New function.
4291 * keyboard.c: Include "character.h" instead of "charset.h".
4292 (command_loop_1): Never call direct_output_forward_char before
4293 a non-ASCII character.
4294 (read_char): If Vkeyboard_translate_table is a char table, always
4295 translated a character.
4297 * keymap.c: Include "character.h".
4298 (store_in_keymap): Handle the case that IDX is a cons.
4299 (Fdefine_key): Handle the case that KEY is a cons and the car part
4300 is also a cons (range).
4301 (push_key_description): Adjusted for the new character code.
4302 (describe_vector): Call describe_char_table for a char table.
4303 (describe_char_table): New function.
4305 * keymap.h (describe_char_table): Extern it.
4307 * lisp.h (enum pvec_type): New member PVEC_SUB_CHAR_TABLE.
4308 (XSUB_CHAR_TABLE, XSETSUB_CHAR_TABLE): New macros.
4309 (CHAR_TABLE_ORDINARY_SLOTS, CHAR_TABLE_SINGLE_BYTE_SLOTS,
4310 SUB_CHAR_TABLE_ORDINARY_SLOTS, SUB_CHAR_TABLE_STANDARD_SLOTS):
4312 (CHAR_TABLE_REF, CHAR_TABLE_SET): Adjusted for the new char table
4314 (CHAR_TABLE_TRANSLATE): Just call char_table_translate.
4315 (CHARTAB_SIZE_BITS_0, CHARTAB_SIZE_BITS_1, CHARTAB_SIZE_BITS_2,
4316 CHARTAB_SIZE_BITS_3): New macros.
4317 (chartab_size): Extern it.
4318 (struct Lisp_Char_Table): Re-designed.
4319 (struct Lisp_Sub_Char_Table): New structure.
4320 (HASH_KEY, HASH_VALUE): Moved from fns.c.
4321 (CHARACTERBITS): Defined as 22.
4322 (GLYPH_MASK_FACE, GLYPH_MASK_CHAR): Adjusted for the above change.
4323 (SUB_CHAR_TABLE_P): Check PVEC_CHAR_TABLE.
4324 (GC_SUB_CHAR_TABLE_P): New macro.
4325 (Fencode_coding_string, Fdecode_coding_string): EXFUN Updated.
4326 (code_convert_string_norecord): Extern deleted.
4327 (init_character_once, syms_of_character, init_charset,
4328 syms_of_composite, Qeq, Fmakehash, insert_from_gap): Extern them.
4330 * lread.c: Include "character.h".
4331 (read_multibyte): New arg NBYTES.
4332 (read_escape): The meaning of returned *BYTEREP changed.
4333 (to_multibyte): Deleted.
4334 (read1): Adjuted the handling of char table and string.
4336 * print.c: Include "character.h" instead of "charset.h".
4337 (print_string): Convert 8-bit raw bytes to octal form by
4338 string_escape_byte8.
4339 (print_object): Adjusted for the new multibyte form. Print 8-bit
4340 raw bytes always in octal form. Handle sub char table correctly.
4342 * process.c: Include "character.h" instead of "charset.h".
4343 (read_process_output): Adjusted for the new code-conversion API.
4344 (send_process): Likewise.
4346 * puresize.h (BASE_PURESIZE): Increased.
4348 * regex.c: Include "character.h" instead of "charset.h".
4349 (BYTE8_TO_CHAR, CHAR_BYTE8_P) [not emacs]: New dummy macros.
4350 (regex_compile): Accept a range whose starting and ending
4351 character have different leading bytes.
4352 (analyse_first): Adjusted for the above change.
4354 * search.c: Include "character.h" instead of "charset.h".
4355 (search_buffer, boyer_moore): Adjusted for the new multibyte form.
4356 (Freplace_match): Adjusted for the change of
4357 multibyte_char_to_unibyte.
4359 * syntax.c: Include "character.h" instead of "charset.h".
4360 (syntax_parent_lookup): Deleted.
4361 (Fmodify_syntax_entry): Accept a cons as CHAR.
4362 (skip_chars): Adjusted for the new multibyte form.
4363 (init_syntax_once): Call char_table_set_range instead of directly
4364 accessing the structure of a char table.
4366 * syntax.h (SET_RAW_SYNTAX_ENTRY): Call CHAR_TABLE_SET.
4367 (SYNTAX_ENTRY_FOLLOW_PARENT): Macro deleted.
4368 (SET_RAW_SYNTAX_ENTRY_RANGE): New macro.
4369 (SYNTAX_ENTRY_INT): Call CHAR_TABLE_REF.
4371 * term.c: Include "buffer.h" and "character.h".
4372 (encode_terminal_code): Adjusted for the new code-conversion API.
4373 (write_glyphs): Likewise.
4374 (produce_glyphs): Call CHAR_WIDTH instead of CHARSET_WIDTH.
4376 * w32term.c (x_new_font): Adjusted for the change of FS_LOAD_FONT.
4378 * xdisp.c: Include "character.h".
4379 (get_next_display_element): Adjusted for the new multibyte form.
4380 (disp_char_vector): Adjusted for the new char table structure.
4381 (decode_mode_spec_coding): Adjusted for the new structure of
4383 (decode_mode_spec): Adjusted for the new code-conversion API.
4385 * xfaces.c: Include "character.h" instead of "charset.h".
4386 (load_face_font): Adjusted for the change of choose_face_font and
4388 (generate_ascii_font): New function.
4389 (set_lface_from_font_name): Adjusted for the change of
4391 (set_font_frame_param): Adjusted for the change of
4393 (free_realized_face): Make it public.
4394 (free_realized_faces_for_fontset): Renamed from
4395 free_realized_multibyte_face. Free also faces realized for ASCII.
4396 (choose_face_font): Argments changed. Adjusted for the change of
4397 fontset_font_pattern and FS_LOAD_FONT.
4399 * xfns.c: Include "character.h".
4400 (x_encode_text): Adjusted for the new code-conversion API.
4402 * xselect.c: Don't include "charset.h".
4403 (selection_data_to_lisp_data): Adjusted for the new code
4406 * xterm.c: Include "character.h".
4407 (x_encode_char): New argument CHARSET. Caller changed.
4408 (x_get_char_face_and_encoding): Call ENCODE_CHAR instead of
4410 (x_get_glyph_face_and_encoding): Likewise.
4411 (x_produce_glyphs): Don't check Vnonascii_translation_table Call
4412 CHAR_WIDTH instead of CHARSET_WIDTH.
4413 (XTread_socket): Adjusted for the new code-conversion API.
4414 (x_new_font): Adjusted for the change of FS_LOAD_FONT.
4415 (x_load_font): Adjusted for the change of struct font.
4418 ;; coding: iso-2022-7bit
4421 Copyright (C) 2002 Free Software Foundation, Inc.
4422 Copying and distribution of this file, with or without modification,
4423 are permitted provided the copyright notice and this notice are preserved.
4425 ;;; arch-tag: 1bff38bd-2030-46ae-9d18-f15e6006b665