1 2004-01-29 Kenichi Handa <handa@m17n.org>
3 * fileio.c (Finsert_file_contents): Avoid detecting a code twice.
5 * coding.c (detect_coding_iso_2022): Fix handling of SS2 and SS3.
6 (detect_coding): Treat '\0' as normal ASCII byte..
7 (detect_coding_system): Likewise.
9 2004-01-27 Kenichi Handa <handa@m17n.org>
11 * coding.h (SJIS_TO_JIS2, JIS_TO_SJIS2): New macros.
13 * coding.c (QCmnemonic, QCdefalut_char)
14 (QCdecode_translation_table, QCencode_translation_table)
15 (QCpost_read_conversion, QCpre_write_conversion): New variables.
16 (get_translation_table): Return a list of translation tables if
18 (decode_coding): Call get_translation_table with ENCODEP 0.
19 (char_encodable_p): If translation_table is non-nil, always call
21 (Fdefine_coding_system_internal): Accept list of translation
22 tables as :encode-translation-table and :decode-translation-table.
23 (Fcoding_system_put): New function.
24 (syms_of_coding): Declare new symbols. Defsubr
26 (decode_coding_sjis): Handle 4th charset (typically JISX0212).
27 (encode_coding_sjis): Likewise.
29 * charset.c (map_charset_chars): Fix arg to map_charset_chars in
30 when the charset is superset type.
32 * character.c (translate_char): Accept list of translation tables.
34 2004-01-25 Kenichi Handa <handa@m17n.org>
36 * coding.h (enum coding_attr_index): New member
37 coding_attr_trans_tbl.
38 (CODING_ATTR_TRANS_TBL): New macro.
40 * coding.c (get_translation_table): New function.
41 (translate_chars): Fix the bug of skipping annotation data.
42 (decode_coding): Utilze get_translation_table.
43 (encode_coding): Likewise.
44 (char_encodable_p): Translate char if necessary.
45 (Funencodable_char_position): Likewise.
46 (Ffind_coding_systems_region_internal): Setup translation table
47 for encode in a coding system attribute vector in advance.
48 (Fcheck_coding_systems_region): Likewise.
49 (Fdefine_coding_system_internal): Allow a symbol as translation
50 table. For shift-jis type coding system, allow 4th charset.
52 2004-01-24 Kenichi Handa <handa@m17n.org>
54 * coding.c (decode_coding_sjis): Check the first byte rigidly.
56 * xdisp.c (get_next_display_element): Pass -1 as POS to
57 FACE_FOR_CHAR if displaying a C-string.
59 2004-01-23 Kenichi Handa <handa@m17n.org>
61 * composite.c (get_composition_id): Handle xoff and yoff in a
64 * composite.h (COMPOSITION_DECODE_RULE): New arg xoff and yoff.
65 (struct composition): New member lbearing and rbearing.
67 * xdisp.c (move_it_to): Optimize for the case (op & MOVE_TO_Y).
68 (x_get_glyph_overhangs): Handle a composition glyph.
69 (x_produce_glyphs): Setup lbearing and rbreaing for a composition
72 * xterm.c (x_compute_glyph_string_overhangs): Handle also a
75 2004-01-18 Kenichi Handa <handa@m17n.org>
77 * print.c: Include charset.h.
78 (Vprint_charset_text_property): New variable.
79 (Qdefault): Extern it.
80 (PRINT_STRING_NON_CHARSET_FOUND)
81 (PRINT_STRING_UNSAFE_CHARSET_FOUND): New macros.
82 (print_check_string_result): New variable.
83 (print_check_string_charset_prop): New function.
84 (print_prune_charset_plist): New variable.
85 (print_prune_string_charset): New function.
86 (print_object): Call print_prune_string_charset if
87 Vprint_charset_text_property is not t.
88 (print_interval): Print nothing if itnerval->plist is nil.
89 (syms_of_print): Declare Vprint_charset_text_property as a lisp
90 variable. Init and staticpro print_prune_charset_plist.
92 2004-01-15 Kenichi Handa <handa@m17n.org>
94 * fontset.c (new_fontset_from_font_name): Use the specified font
95 for all characters in the new fontset.
97 * macterm.c (x_set_mouse_face_gc): Call FACE_FOR_CHAR with POS and
100 * xdisp.c (x_produce_glyphs): Call FACE_FOR_CHAR with POS and
101 OBJECT args for composition too.
103 * w32term.c (x_set_mouse_face_gc): Call FACE_FOR_CHAR with POS and
106 2004-01-13 Kenichi Handa <handa@m17n.org>
108 * dispextern.h (FACE_FOR_CHAR): New args POS and OBJECT.
110 * fontset.c (reorder_font_vector): Adjusted for the change of
112 (fontset_face): New arg id. Caller changed.
113 (face_for_char): New args pos and object.
114 (make_fontset_for_ascii_face): Adjusted for the change of FONT_DEF
116 (fs_query_fontset): Check NAME by Fassoc too.
117 (Fset_fontset_font): Allow non-XLFD font name.
118 (Ffontset_info): Adjusted for the change of FONT_DEF format.
120 * fontset.h (face_for_char): Prototype adjusted.
122 * xdisp.c (face_before_or_after_it_pos): Call FACE_FOR_CHAR with
124 (get_next_display_element): Likewise.
125 (append_space): Likewise.
126 (extend_face_to_end_of_line): Likewise.
127 (get_char_face_and_encoding): Likewise.
128 (BUILD_COMPOSITE_GLYPH_STRING): Likewise.
129 (x_produce_glyphs): Likewise.
131 * xfaces.c (compute_char_face): Call FACE_FOR_CHAR with
134 * xterm.c (x_set_mouse_face_gc): Call FACE_FOR_CHAR with
137 2004-01-03 Jason Rumney <jasonr@gnu.org>
139 * w32select.c (Fw32_set_clipboard_data): Avoid potential realloc
140 of GlobalAlloc'ed memory.
142 2003-12-29 Kenichi Handa <handa@m17n.org>
144 * ccl.c (Fccl_execute_on_string): Fix the condition of loop.
146 * charset.h (charset_table_used): Delete extern.
148 * charset.c (charset_table_used): Make it static.
149 (map_charset_chars): Fix args to c_function with.
151 * chartab.c (map_sub_char_table_for_charset): Fix args to
154 * coding.h (enum coding_result_code): Delete
155 CODING_RESULT_INSUFFICIENT_CMP, add CODING_RESULT_INVALID_SRC.
157 * coding.c (Qinsufficient_source, Qinconsistent_eol)
158 (Qinvalid_source, Qinterrupted, Qinsufficient_memory): New
160 (Vlast_code_conversion_error): New variables.
161 (syms_of_coding): DEFSYM or DEFVAR_LISP them.
162 (ONE_MORE_BYTE): Record error if any instead of signaling an
163 error. If non-ASCII multibyte char is found, return the negative
164 value of the code. All callers changed to check it.
165 (ONE_MORE_BYTE_NO_CHECK): Likewise.
166 (record_conversion_result): New function. All codes setting
167 coding->result are changed to call this function.
168 (detect_coding_utf_8): Don't use the local variable incomplete.
169 (decode_coding_utf_8): Likewise.
170 (emacs_mule_char): Change the second arg to `const'.
171 (detect_coding_emacs_mule): Don't use the local variable
173 (detect_coding_sjis): Likewise.
174 (detect_coding_big5): Likewise.
175 (decode_coding): Fix of flushing out unprocessed data.
176 (make_conversion_work_buffer): Fix making of a work buffer.
177 (decode_coding_object): Return coding->dst_object;
179 * fontset.c (set_fontset_font): Fix args.
181 * lisp.h (CHARACTERBITS): Define as 22.
183 * process.c (send_process): Be sure to set coding->src_multibyte.
185 * xdisp.c (handle_auto_composed_prop): Fix setting of limit.
187 2003-12-02 Kenichi Handa <handa@m17n.org>
189 * xdisp.c (handle_auto_composed_prop): Give limit to
190 Fnext_single_char_property_change.
192 2003-12-02 Kenichi Handa <handa@m17n.org>
194 * coding.c (detect_coding): Fix previous change.
195 (detect_coding_system): Likewise.
197 2003-12-02 Kenichi Handa <handa@m17n.org>
199 * composite.c (syms_of_composite): Don't make the compostion hash
202 * fontset.c (Fset_fontset_font): Fix docstring.
204 * lisp.h (detect_coding_system): Adjust prototype.
206 * fileio.c (kill_workbuf_unwind): Delete this function.
207 (Finsert_file_contents): Adjust the call of detect_coding_system.
208 Get conversion_buffer by code_conversion_save. Use the macor
209 CODING_MAY_REQUIRE_DECODING. After decoding, update
212 * coding.h (make_conversion_work_buffer): Delete extern.
213 (code_conversion_save): Extern it.
215 * coding.c (enum iso_code_class_type): Delete ISO_carriage_return.
216 (CODING_GET_INFO): Delete argument eol_type. Callers changed.
217 (decode_coding_utf_8): Don't do eol converion.
218 (detect_coding_utf_16): Check coding->src_chars, not
219 coding->src_bytes. Add heuristics for those that have no
221 (decode_coding_emacs_mule): Don't do eol converion.
222 (decode_coding_iso_2022): Likewise.
223 (decode_coding_sjis): Likewise.
224 (decode_coding_big5): Likewise.
225 (decode_coding_charset): Likewise.
226 (adjust_coding_eol_type): Return a new coding system.
227 (detect_coding): Don't detect eol. Fix for utf-16 detection.
228 (decode_eol): In case of CRLF->LF conversion, use del_range_2 on
230 (decode_coding): Pay attention to undo_list. Do eol convesion for
231 all types of coding-systems (if necessary).
232 (Vcode_conversion_work_buf_list): Delete it.
233 (Vcode_conversion_reused_workbuf): Renamed from
234 Vcode_conversion_reused_work_buf.
235 (Vcode_conversion_workbuf_name): New variable.
236 (reused_workbuf_in_use): New variable.
237 (make_conversion_work_buffer): Delete the arg DEPTH.
238 (code_conversion_restore): Argument changed to cons.
239 (code_conversion_save): Delete the argument BUFFER. Callers
241 (detect_coding_system): New argument src_chars. Callers changed.
242 Fix for utf-16 detection.
243 (init_coding_once): Don't use ISO_carriage_return.
244 (syms_of_coding): Initialized Vcode_conversion_workbuf_name and
245 reused_workbuf_in_use.
247 2003-11-24 Kenichi Handa <handa@m17n.org>
249 * keymap.c (store_in_keymap): Pay attention to the case that idx
250 is a cons specifying a character range.
252 * coding.c (Fdefine_coding_system_internal): Fix previous change.
254 2003-11-23 Kenichi Handa <handa@m17n.org>
256 * xdisp.c (handle_auto_composed_prop): Fix the case of returning
257 HANDLED_RECOMPUTE_PROPS.
259 * coding.c (Fdefine_coding_system_internal): Fix checking of
262 2003-11-22 Kenichi Handa <handa@m17n.org>
264 * charset.c (find_charsets_in_text): Delete unused locale
266 (Fset_charset_priority): Update Vemacs_mule_charset_list too.
268 * coding.c (encode_coding_emacs_mule): Emit bytes with MSB.
269 Resync charset_list to Vemacs_mule_charset_list.
271 * keymap.c (store_in_keymap): Pay attention to the case that idx
272 is a cons specifying a character range.
274 2003-11-18 Kenichi Handa <handa@m17n.org>
276 * composite.c (update_compositions): Bind inhibit-read-only, etc
277 to t before calling remove-list-of-text-properties.
279 * print.c (print_object): Always print ASCII chars as is.
281 2003-11-17 Kenichi Handa <handa@m17n.org>
283 * keymap.c (Fdefine_key): Fix handling of Lucid style event type
286 * fns.c (Fmapconcat): Signal an error if SEQUENCE is a char table.
290 2003-11-15 Kenichi Handa <handa@m17n.org>
292 * syntax.c (skip_chars): Be sure to alloca char_ranges when
295 2003-11-14 Kenichi Handa <handa@m17n.org>
297 * xfaces.c (set_lface_from_font_name): Fix for the case that
298 FONTNAME is not fontset name.
300 2003-11-13 Kenichi Handa <handa@m17n.org>
302 * fns.c (base64_encode_1): Fix previous change.
304 2003-11-08 Kenichi Handa <handa@m17n.org>
306 * fontset.c (set_fontset_font): New function.
307 (Fset_fontset_font): If a font is specified for a charset, use
308 map_charset_chars to store the font spec in a fontset.
310 2003-10-29 Kenichi Handa <handa@m17n.org>
312 * fontset.c (fontset_face): Create a fallback fontset on demand
313 (make_fontset): Don't create a fallback fontset here.
314 (free_face_fontset): Free a fallback fontset (if any) too.
315 (n_auto_fontsets): Delete this variable.
316 (auto_fontset_alist): New variable.
317 (new_fontset_from_font_name): Check auto_fontset_alist.
318 (dump_fontset) [FONTSET_DEBUG]: Fully re-written.
319 (Ffontset_list_all) [FONTSET_DEBUG]: New function.
320 (syms_of_fontset): Initialize and staticpro auto_fontset_alist.
321 Defsubr Sfontset_list_all.
323 2003-10-24 Kenichi Handa <handa@m17n.org>
325 * xterm.c (x_list_fonts): Fix excluding of auto-scaled fonts.
327 2003-10-23 Kenichi Handa <handa@m17n.org>
329 * fontset.c (Fnew_fontset): Check NAME more rigidly.
331 2003-10-17 Kenichi Handa <handa@m17n.org>
333 * editfns.c (Fgoto_char): Fix docstring.
335 2003-10-16 Kenichi Handa <handa@m17n.org>
337 * insdel.c (insert_from_gap): Adjust intervals correctly.
339 2003-10-12 Jason Rumney <jasonr@gnu.org>
341 * w32term.c (GLYPHSET, WCRANGE): Define if system headers don't.
342 (pfnGetFontUnicodeRanges): New dynamically loaded function.
343 (w32_initialize): Try to load it.
344 (x_get_font_repertory): Use it if available.
345 (w32_encode_char): Add shortcut for unicode output.
347 * w32fns.c (w32_load_system_font): Default charset to -1.
348 (x_to_w32_charset): Match all fonts for unicode.
349 (w32_to_x_charset): New parameter matching. Don't return partial
350 or wildcard charsets.
351 (w32_to_all_x_charsets): Don't return partial or wildcard charsets.
352 (w32_codepage_for_font): Return CP_UNICODE for unicode.
353 (w32_to_x_font): Match charset to real charset.
354 (enum_font_cb2): Always list unicode versions.
356 * makefile.w32-in (temacs): Increase EMHEAP.
358 2003-10-11 Jason Rumney <jasonr@gnu.org>
360 * w32term.c (w32_encode_char): New charset parameter.
361 font_info.encoding becomes encoding_type.
362 (x_get_font_repertory): New function. Warning: stub only!
363 (x_new_font): Return quickly if font already set.
364 (x_new_fontset): fontsetname parameter is Lisp_Object.
365 Use new fs_query_fontset. Try new_fontset_from_font_name. Use
366 fontset_name for return value.
368 * w32term.h: Declare x_get_font_repertory.
370 * w32select.c (Fw32_set_clipboard_data): Use string_x_string_p in
371 place of find_charset_in_text. Use encode_coding_object in place
373 (Fw32_get_clipboard_data): Use decode_coding_c_string in place of
376 * w32fns.c (Fx_create_frame, x_create_tip_frame): Use new version
378 (w32_load_system_font): Initialize charset as unicode.
379 font_info.encoding becomes encoding_type.
380 (w32_to_x_font): Use decode_coding_c_string in place of
382 (x_to_w32_font): Use encode_coding_object in place of
384 (syms_of_w32fns): Set get_font_repertory_func.
386 * w32console.c: Include character.h. Use terminal_encode_buffer
388 (write_glyphs): Use new version of encode_terminal_code. Use
389 encode_coding_object in place of encode_coding.
391 * w32bdf.c (w32_load_bdf_font): Clear font_info before filling.
392 encoding becomes encoding_type.
394 * term.c (terminal_encode_buffer): Make externally visible.
396 * makefile.w32-in: Add character.h dependancies.
397 (character.o, chartab.o): New targets.
399 2003-10-10 Kenichi Handa <handa@m17n.org>
401 * fileio.c (Finsert_file_contents) [DOS_NT]: Use the macro
404 2003-10-07 Andreas Schwab <schwab@suse.de>
406 * coding.c (produce_chars): Revert last change.
408 2003-10-06 Kenichi Handa <handa@m17n.org>
410 * charset.h (charset_unicode): Extern it.
412 * charset.c (string_xstring_p): Check by (C >= 0x100).
413 (find_charsets_in_text): Format of the arc CHARSETS changed. New
415 (Ffind_charset_region, Ffind_charset_string): Adjusted for the
416 change of find_charsets_in_text.
417 (Fsplit_char): Fix doc. Never return unknown.
419 * chartab.c (char_table_translate): Use CHARACTERP, not INETEGERP.
421 * coding.c (Fdefine_coding_system_alias): Update
424 * fontset.c (load_font_get_repertory): Pay attention to the case
425 that ENCODING of a font is specified by a char-table.
427 * xterm.c (x_get_font_repertory): Handle the case that the
428 encoding of font is other than Unicode.
430 2003-10-02 Kenichi Handa <handa@m17n.org>
432 * term.c (encode_terminal_code): Don't handle glyph-table. Check
433 if a character is encodable by the terminal coding system. If
434 not, produces proper number of `?'s. Update
435 terminal_encode_buffer and terminal_encode_buf_size if necessary.
436 (produce_glyphs): Check by CHAR_BYTE8_P, not SINGLE_BYTE_CHAR_P.
438 2003-10-01 Kenichi Handa <handa@m17n.org>
440 * term.c (terminal_encode_buffer, terminal_encode_buf_size): New
442 (encode_terminal_code): Argument changed. Encode multiple
443 characters at once. Store the result of encoding in
444 terminal_encode_buffer.
445 (write_glyphs): Adjusted for the change of encode_terminal_code.
446 (insert_glyphs): Likewise.
447 (term_init): Initialize terminal_encode_buffer and
448 terminal_encode_buf_size.
450 * coding.c (consume_chars): If coding->src_object is nil, don't
453 2003-09-30 Kenichi Handa <handa@m17n.org>
455 * character.c (char_string): Use ASCII_CHAR_P instead of
458 2003-09-30 Kenichi Handa <handa@m17n.org>
460 * xdisp.c (handle_auto_composed_prop): Check if the last
461 characters of auto-composed region is newly composed with the
462 following characters.
463 (handle_composition_prop): Fix checking of point being inside
466 2003-09-26 Kenichi Handa <handa@m17n.org>
468 * fns.c (concat): Don't change multibyteness of the result by
469 concatenating an 8-bit character.
471 * data.c (Faset): Check newelt by CHECK_CHARACTER. Don't change
472 multibyteness of the result when newelt is an 8-bit character.
474 2003-09-29 Dave Love <fx@gnu.org>
476 * xmenu.c (find_and_call_menu_selection): Make menu_bar_items_used
479 * xfns.c (DefaultDepthOfScreen, x_encode_text): Remove unused vars.
481 * xfaces.c (face_numeric_value): Declare dim size_t.
482 (Finternal_lisp_face_equal_p): Remove unused f.
484 * xdisp.c (BUILD_CHAR_GLYPH_STRINGS, display_and_set_cursor)
485 (MATRIX_ROW): Remove unused vars.
486 (draw_glyphs, x_insert_glyphs, fast_find_position)
487 (fast_find_position, fast_find_string_pos): Use EMACS_INT for
490 * regex.c (regex_compile): Remove unused var.
492 * minibuf.c (Fminibuffer_complete_word): Remove unused var.
494 * keymap.c (Fset_keymap_parent, map_keymap, Fcopy_keymap)
495 (Faccessible_keymaps, where_is_internal): Remove unused vars.
497 * keyboard.c (cancel_hourglass_unwind): Return Qnil.
499 * frame.c (frame_name_fnn_p): Make len EMACS_INT.
501 * fileio.c (Fwrite_region): Remove unused var.
503 * dispnew.c (adjust_frame_glyphs_for_frame_redisplay)
504 (adjust_frame_glyphs_for_window_redisplay): Remove unused ch_dim.
506 * composite.c (Fremove_list_of_text_properties): Declare.
508 * coding.c (inhibit_pre_post_conversion): Removed (unused).
509 (alloc_destination, produce_chars): Use EMACS_INT for byte/char
511 (coding_inherit_eol_type): Remove unused attrs.
512 (detect_coding): Cast arg of detect_eol.
514 * charset.c (syms_of_charset): Remove unused var p.
515 (find_charsets_in_text, Ffind_charset_region): Use EMACS_INT for
518 * casetab.c (set_case_table): Remove unused var.
520 * window.c (Fdisplay_buffer, Fframe_selected_window): Remove
524 2003-09-26 Dave Love <fx@gnu.org>
526 * xterm.c (x_bitmap_mask): Declare.
528 2003-09-17 Dave Love <fx@gnu.org>
530 * xterm.c (x_term_init): Fix type error.
532 * lisp.h: Add Funibyte_char_to_multibyte.
534 * coding.c (Fread_coding_system): Fix arg of XSETSTRING.
535 (Fset_coding_system_priority): Doc fix.
537 * alloc.c: Sync with HEAD version.
539 * ccl.c (ccl_driver): Fix arg of CHARACTERP.
541 * indent.c (check_composition): Make start and end EMACS_INT.
543 * character.c (lisp_string_width): Make ignore and end EMACS_INT.
545 * xdisp.c (handle_composition_prop, check_point_in_composition):
546 Make buffer positions EMACS_INT.
548 * composite.c (find_composition, run_composition_function)
549 (update_compositions, Ffind_composition_internal): Make buffer
552 * composite.h (find_composition, update_compositions): Make
553 position args EMACS_INT.
555 * keyboard.c (adjust_point_for_property): Make beg and end
558 * intervals.c (get_property_and_range)
559 * intervals.h (get_property_and_range): Make start and end EMACS_INT.
561 * unexalpha.c: Don't include varargs.h.
563 2003-09-16 Dave Love <fx@gnu.org>
565 * coding.h (ENCODE_UTF_8): New.
567 * Makefile.in (gtkutil.o): Depend on coding.h.
569 * coding.c (Fset_coding_system_priority): Doc fix.
571 2003-09-16 Kenichi Handa <handa@m17n.org>
573 * fileio.c (Finsert_file_contents): Call setup_coding_system in
574 the case of auto saving.
576 2003-09-10 Andreas Schwab <schwab@suse.de>
578 * chartab.c (map_char_table): Protect `range' from GC.
579 (map_char_table_for_charset): Likewise.
581 2003-07-09 Kenichi Handa <handa@m17n.org>
583 * coding.c (decode_coding_sjis): Check bytes more rigidly.
585 2003-06-26 Kenichi Handa <handa@m17n.org>
587 * fileio.c (choose_write_coding_system): Return a decided coding
589 (Fwrite_region): Set Vlast_coding_system_used to the return value
590 of choose_write_coding_system.
592 2003-06-06 Kenichi Handa <handa@m17n.org>
594 * charset.c (Fset_charset_priority): Pay attention to duplicated
597 * coding.c (QCcategory): New variable.
598 (syms_of_coding): Defsym it. Set all elements of
599 Vcoding_category_table and their symbol values.
600 (Fset_coding_system_priority): Doc fix. Update symbol qvalues of
601 coding-category-XXX, and coding-category-list.
602 (Fdefine_coding_system_internal): Add category in the plist.
604 2003-06-05 Kenichi Handa <handa@m17n.org>
606 * callproc.c (Fcall_process): Handle carryover correctly.
608 * coding.c (decode_coding_iso_2022): Fix handling of invalid
610 (raw_text_coding_system): Check NILP (coding_system).
611 (coding_inherit_eol_type): Check NILP (coding_system) and
613 (consume_chars): Fix for the case of raw-text.
615 * process.c (read_process_output): Handle carryover correctly.
617 2003-06-02 Dave Love <fx@gnu.org>
619 * regex.c (re_search_2): Fix last change.
621 2003-05-30 Kenichi Handa <handa@m17n.org>
623 * regex.c (GET_CHAR_BEFORE_2): Check multibyte, not
624 target_multibyte. Even in a unibyte case, return a converted
626 (GET_CHAR_AFTER): New macro.
627 (PATFETCH): Translate via multibyte char.
628 (HANDLE_UNIBYTE_RANGE): Delete this macro.
629 (SETUP_MULTIBYTE_RANGE): New macro.
630 (regex_compile): Setup compiled code so that its multibyteness
631 matches that of a target. Fix the handling of "[X-YZ]" using
632 SETUP_MULTIBYTE_RANGE.
633 (analyse_first) <charset>: For filling fastmap for all multibyte
634 characters, don't check by BASE_LEADING_CODE_P.
635 (re_search_2): Don't check RE_TARGET_MULTIBYTE_P (bufp). It is
636 the same as RE_MULTIBYTE_P (bufp) now.
637 (mutually_exclusive_p): Check by (! multibyte ||
639 (TARGET_CHAR_AND_LENGTH): Delete this macro.
640 (TRANSLATE_VIA_MULTIBYTE): New macro.
641 (re_match_2_internal): Don't check RE_TARGET_MULTIBYTE_P (bufp).
642 It is the same as RE_MULTIBYTE_P (bufp) now.
643 <exactn>: Translate via multibyte.
644 <anychar>: Fetch a character by RE_STRING_CHAR_AND_LENGTH. Don't
646 <charset, charset_not>: Fetch a character by
647 RE_STRING_CHAR_AND_LENGTH. Translate via multibyte.
648 <duplicate>: Call bcmp_translate with the last arg `multibyte'.
649 <wordbound, notwordbound, wordbeg, wordend, syntaxspec,
650 notsyntaxspec, categoryspec, notcategoryspec> Fetch a character
652 (bcmp_translate): Likewise.
654 * search.c (compile_pattern): Check the member target_multibyte,
655 not the member multibyte of buf.
657 * lread.c (read1): While reading a string, set force_singlebyte
658 and force_multibyte correctly.
660 * charset.c (Fset_unibyte_charset): Fix setting up of
661 unibyte_to_multibyte_table.
662 (init_charset_once): Likewise.
664 2003-05-29 Kenichi Handa <handa@m17n.org>
666 * coding.c (setup_coding_system): If coding has
667 post-read-conversion or pre-write-conversion, set
668 CODING_REQUIRE_DECODING_MASK and CODING_REQUIRE_ENCODING_MASK
670 (decode_coding_gap): Run post-read-conversion if any.
672 * fileio.c (Finsert_file_contents): Even if we read into a
673 unibyte buffer, check if we must decode the result or not.
675 2003-05-29 Kenichi Handa <handa@m17n.org>
677 * coding.c (make_conversion_work_buffer): Change the work buffer
678 name to the same one as that of Emacs 21.
680 2003-05-28 Kenichi Handa <handa@m17n.org>
682 * coding.h (make_conversion_work_buffer): Prototype adjusted.
683 (code_conversion_restore): Don't extern it.
685 * coding.c (detected_mask): Delete unused variable.
686 (decode_coding_iso_2022): Pay attention to the byte sequence of
687 CTEXT extended segment, and retain those bytes as is.
688 (decode_coding_ccl): Delete unused variable `valids'.
689 (setup_coding_system): Delete unused variable `category'.
690 (consume_chars): Delete unused variable `category'. Make it work
691 for non-multibyte case.
692 (make_conversion_work_buffer): Argument changed.
693 (saved_coding): Delete unused variable.
694 (code_conversion_restore): Don't check saved_coding->destination.
695 (code_conversion_save): New function.
696 (decode_coding_gap, encode_coding_gap): Call code_conversion_save
697 instead of record_unwind_protect.
698 (decode_coding_object, encode_coding_object): Likewise. Recover
700 (detect_coding_system): Delete unused variable `mask'.
701 (Fdefine_coding_system_internal): Delete unsed vaiable id;
703 * fileio.c (kill_workbuf_unwind): New function.
704 (Finsert_file_contents): On replacing, call
705 make_conversion_work_buffer with correct args, and call
706 record_unwind_protect with the first arg kill_workbuf_unwind.
708 * lisp.h (Fgenerate_new_buffer_name): EXFUN it.
710 2003-05-20 Kenichi Handa <handa@m17n.org>
712 * fontset.c (BASE_FONTSET_P): Check FONTSET_BASE, not
714 (fontset_add): Fix for the case that TO is less than TO1.
715 (Ffontset_info): Don't use fallback fontset on checking the
717 (dump_fontset): New function for debugging.
719 * coding.c (Fdefine_coding_system_internal): Fix for the case that
720 coding_type is Qcharset.
722 2003-05-07 Kenichi Handa <handa@m17n.org>
724 * chartab.c (map_sub_char_table): New argument DEFAULT_VAL.
725 (map_char_table): Don't inherit the value from the parent on
726 initializing VAL. Adjusted for the above change.
728 2003-05-06 Kenichi Handa <handa@m17n.org>
730 * coding.c (Qsignature, Qendian): Delete these variables.
731 (syms_of_coding): Don't initialize them.
732 (CATEGORY_MASK_UTF_16_AUTO): New macro.
733 (detect_coding_utf_16): Add CATEGORY_MASK_UTF_16_AUTO in
735 (decode_coding_utf_16): Don't detect BOM here.
736 (encode_coding_utf_16): Produce BOM if CODING_UTF_16_BOM (coding)
737 is NOT utf_16_without_bom.
738 (setup_coding_system): For a coding system of type utf-16, check
739 if the attribute :endian is Qbig or not (not nil or not), and set
740 CODING_REQUIRE_DETECTION_MASK if BOM detection is required.
741 (detect_coding): If coding type is utf-16 and BOM detection is
743 (Fdefine_coding_system_internal): For a coding system of type
744 utf-16, check if the attribute :endian is Qbig or not (not nil or
747 2003-05-06 Kenichi Handa <handa@m17n.org>
749 * coding.c (coding_set_source): Fix for the case that the current
750 buffer is different from coding->src_object.
751 (decode_coding_object): Don't use the conversion work buffer if
752 DST_OBJECT is a buffer.
754 2003-05-04 Dave Love <fx@gnu.org>
756 * lread.c (read_emacs_mule_char) [len==2]: Index
757 emacs_mule_charset correctly.
759 2003-02-16 Dave Love <fx@gnu.org>
761 * coding.c (Qbig5, Vbig5_coding_system, CATEGORY_MASK_BIG5)
762 (detect_coding_big5, decode_coding_big5, encode_coding_big5)
763 (Fdecode_big5_char, Fencode_big5_char): Deleted. (Big5 no longer
765 (setup_coding_system, coding_category, CATEGORY_MASK_ANY)
766 (detected_mask): Remove Big5 bits.
768 2003-04-09 Kenichi Handa <handa@m17n.org>
770 The following changes are to make the font rescaling facility
771 compatible with Emacs 21.
773 * xfaces.c (Vface_font_rescale_alist): Renamed from
774 Vface_resizing_fonts.
775 (struct font_name): Rename member resizing_ratio to rescale_ratio.
776 (font_rescale_ratio): Renamed from font_resizing_ratio.
777 (split_font_name): Set font->rescale_ratio.
778 (better_font_p): Pay attention to font->rescale_ratio.
779 (build_scalable_font_name): Likewise. Change RESX, and RESY
781 (syms_of_xfaces): Declare Vface_font_rescale_alist as a Lisp
784 2003-03-28 Kenichi Handa <handa@m17n.org>
786 * coding.c (Qutf_16_be_nosig, Qutf_16_be, Qutf_16_le_nosig)
787 (Qutf_16_le): Remove these variables.
788 (syms_of_coding): Don't DEFSYM them.
789 (decode_coding_utf_16): Fix handling of BOM.
790 (encode_coding_utf_16): Fix handling of BOM.
792 2003-03-14 Kenichi Handa <handa@m17n.org>
794 * fileio.c (Finsert_file_contents): On replacing, before decoding
795 the file into the work buffer, set point of the work buffer to the
798 2003-02-13 Dave Love <fx@gnu.org>
800 * coding.c (Fcheck_coding_systems_region): Fix type errors.
802 2003-02-04 Dave Love <fx@gnu.org>
804 * xterm.c (XTread_socket): Check Lisp types for Vx_keysym_table
807 2003-01-31 Kenichi Handa <handa@m17n.org>
809 * xdisp.c (SKIP_GLYPHS): New macro.
810 (set_cursor_from_row): Pay attention to string display properties.
812 * category.c (copy_category_entry): Fix for the case that RANGE
815 * xterm.c (x_encode_char): Call ccl_driver with the last arg Qnil.
817 * w32term.c (w32_encode_char): Call ccl_driver with the last arg
820 2003-01-30 Kenichi Handa <handa@m17n.org>
822 * charset.c (Fcharset_id_internal): New function.
823 (syms_of_charset): Defsubr it.
825 * coding.c (decode_coding_ccl, encode_coding_ccl): Call ccl_driver
826 with the last arg charset_list acquired from coding.
827 (Fdefine_coding_system_internal): For ccl-based coding system, fix
828 the attribute coding_attr_ccl_valids.
830 * coding.h (enum define_coding_ccl_arg_index): Set the first
831 member coding_arg_ccl_decoder to coding_arg_max.
833 * ccl.h (ccl_driver): Prototype adjusted.
835 * ccl.c (CCL_DECODE_CHAR, CCL_ENCODE_CHAR): New macros.
836 (ccl_driver): New arg CHARSET_LIST. Use the above macros instead
837 of DECODE_CAHR, ENCODE_CHAR, CHAR_CHARSET.
838 (Fccl_execute): Call ccl_driver with the last arg Qnil.
839 (Fccl_execute_on_string): Likewise.
841 2003-01-11 Kenichi Handa <handa@m17n.org>
843 * charset.h (ENCODE_CHAR): If the method is SUBSET or SUPERSET,
846 * charset.c (encode_char): Fix handling of methods SUBSET and
849 * xterm.c (x_new_fontset): Fix previous change.
851 2003-01-10 Dave Love <fx@gnu.org>
853 * composite.c (syms_of_composite): Make composition_hash_table
856 2003-01-10 Kenichi Handa <handa@m17n.org>
858 * dispextern.h (check_face_attributes, generate_ascii_font_name)
859 (font_name_registry): Don't extern them.
860 (split_font_name_into_vector, build_font_name_from_vector): Extern
863 * fontset.h (Qfontset): Don't extern it.
864 (new_fontset_from_font_name): Extern it.
866 * fontset.c: Give 8 extra slots to fontset objects.
867 (Qfontset_info): New variable.
868 (syms_of_fontset): Defsym it.
869 (FONTSET_FALLBACK): New macro.
870 (fontset_face): Try also the default fontset.
871 (make_fontset): Realize a fallback fontset from the default
873 (generate_ascii_font_name): Moved from xfaces.c. Rewritten by
874 using split_font_name_into_vector and build_font_name_from_vector.
875 (Fset_fontset_font): Access the elements of font_spec by enum
876 FONT_SPEC_INDEX. If font_spec is a string, extract the registry
877 name by using split_font_name_into_vector.
878 (Fnew_fontset): If no ASCII font is specified in FONTLIST,
879 generate a proper font name from the fontset name. Update
880 Vfontset_alias_alist.
881 (n_auto_fontsets): New variable.
882 (new_fontset_from_font_name): New function.
883 (Ffont_info): Store the information about fonts generated from the
884 default fontset in the first extra slot of the returned
887 * xfaces.c (generate_ascii_font_name): Moved to fontset.c.
888 (font_name_registry): Function deleted.
889 (split_font_name_into_vector): New function.
890 (build_font_name_from_vector): New function.
891 (font_list): The argument REGISTRY is now a list of registry
893 (choose_face_font): If we are choosing an ASCII font, and ATTRS
894 specifies an explicit font name, return the name as is. Make a
895 list of registy names.
897 * xfns.c (x_set_font, x_create_tip_frame): Adjusted to the change
899 (Fx_create_frame): Don't call x_new_fontset here. Just use
900 x_list_fonts to check the existence of fonts.
902 * xterm.h (x_new_fontset): Prototype adjusted.
904 * xterm.c (x_new_fontset): Change the arg FONTSETNAME to Lisp
905 string. Use new_fontset_from_font_name to create a fontset from a
908 2003-01-07 Dave Love <fx@gnu.org>
910 * Makefile.in: Fix some dependencies.
912 * keymap.c (Fapropos_internal): Don't gcpro apropos_predicate but
913 set it to nil before returning.
915 * composite.c (update_compositions): Fix type error.
917 * syntax.c (skip_chars, skip_syntaxes): Fix type errors.
919 2003-01-07 Kenichi Handa <handa@etl.go.jp>
921 * xterm.c (x_new_font): Optimize for the case that the font is
922 already set for the frame.
924 2003-01-06 Kenichi Handa <handa@m17n.org>
926 * chartab.c (char_table_ascii): Check if the char table contents
927 is sub-char-table or not.
928 (char_table_set): Fix argument to char_table_ascii.
929 (char_table_set_range): Likewise.
931 * coding.c (CATEGORY_MASK_RAW_TEXT): New macro.
932 (detect_coding_utf_8, detect_coding_utf_16)
933 (detect_coding_emacs_mule, detect_coding_iso_2022)
934 (detect_coding_sjis, detect_coding_big5)
935 (detect_coding_ccl, detect_coding_charset): Change argument MASK
936 to DETECT_INFO. Update DETECT_INFO and return 1 if the byte
937 sequence is valid in this coding system. Callers changed.
938 (MAX_ANNOTATION_LENGTH): New macro.
939 (ADD_ANNOTATION_DATA): New macro.
940 (ADD_COMPOSITION_DATA): Argument changed. Callers changed. Call
941 ADD_ANNOTATION_DATA. The format of annotation data changed.
942 (ADD_CHARSET_DATA): New macro.
943 (emacs_mule_char): New argument ID. Callers changed.
944 (decode_coding_emacs_mule, decode_coding_iso_2022)
945 (decode_coding_sjis, decode_coding_big5, decode_coding_charset):
946 Produce charset annotation data in coding->charbuf.
947 (encode_coding_emacs_mule, encode_coding_iso_2022): Pay attention
948 to charset annotation data in coding->charbuf.
949 (setup_coding_system): Add CODING_ANNOTATE_CHARSET_MASK
950 coding->common_flags if the coding system is iso-2022 based and
952 (produce_composition): Adjusted for the new annotation data
954 (produce_charset): New function.
955 (produce_annotation): Handle charset annotation.
956 (handle_composition_annotation, handle_charset_annotation): New
958 (consume_chars): Handle charset annotation. Utilize the above two
960 (encode_coding_object): If SRC_OBJECT and DST_OBJECT are the same
961 buffer, get the deleted text as a string and set
962 coding->src_object to that string.
963 (detect_coding, detect_coding_system): Use the new struct
964 coding_detection_info.
966 * coding.h (struct coding_detection_info): New structure.
967 (struct coding_system): Prototype of the member `detector'
969 (CODING_ANNOTATE_CHARSET_MASK): New macro.
971 2003-01-06 Kenichi Handa <handa@etl.go.jp>
973 * insdel.c (insert_from_gap): Fix argument to offset_intervals.
975 2003-01-03 Dave Love <fx@gnu.org>
977 * keymap.c (apropos_predicate, apropos_accumulate): Declare
979 (Fapropos_internal): Don't gcpro apropos_accumulate. Set result
980 to new local and nullify apropos_accumulate before returning.
981 (syms_of_keymap): Staticpro and initialize apropos_accumulate.
983 2002-12-05 Kenichi Handa <handa@m17n.org>
985 * charset.c (Fdefine_charset_internal): Setup charset.fast_map
988 2002-11-26 Dave Love <fx@gnu.org>
990 * fns.c (Flanginfo): Call synchronize_system_time_locale.
992 2002-11-07 Kenichi Handa <handa@m17n.org>
994 The following changes are to make character composition happen
995 automatically on displaying.
997 * Makefile.in (lisp, shortlisp): Add composite.elc
999 * composite.h (Qauto_composed, Vauto_composition_function,
1000 Qauto_composition_function): Extern them.
1002 * composite.c (Vcomposition_function_table,
1003 Qcomposition_function_table): Delete variables.
1004 (Qauto_composed, Vauto_composition_function,
1005 Qauto_composition_function): New variables.
1006 (run_composition_function): Don't call
1007 compose-chars-after-function.
1008 (update_compositions): Clear `auto-composed' text property.
1009 (compose_chars_in_text): Delete this function.
1010 (syms_of_composite): Staticpro Qauto_composed and
1011 Qauto_composition_function. Declare Vauto_composition_function as
1014 * dispextern.h (enum prop_idx): Add member AUTO_COMPOSED_PROP_IDX.
1016 * xdisp.c (it_props): Add an entry for Qauto_composed.
1017 (handle_auto_composed_prop): New function.
1019 * xselect.c (selection_data_to_lisp_data): Don't call
1020 compose_chars_in_text.
1022 2002-11-06 Dave Love <fx@gnu.org>
1024 * keyboard.c (read_char): Modify checking around use of
1025 Vkeyboard_translate_table.
1027 * xterm.c (XTread_socket): Check Lisp types for Vx_keysym_table
1030 2002-11-06 Kenichi Handa <handa@m17n.org>
1032 * coding.c (decode_coding_utf_8): When eol_type is Qdos, handle
1033 the case that the last byte is '\r' correctly.
1034 (decode_coding_emacs_mule): Likewise.
1035 (decode_coding_iso_2022): Likewise.
1036 (decode_coding_sjis): Likewise.
1037 (decode_coding_big5): Likewise.
1038 (decode_coding_charset): Likewise.
1039 (produce_chars): Likewise.
1040 (decode_coding): Flushing out the unprocessed data correctly.
1041 (decode_coding_gap): Set CODING_MODE_LAST_BLOCK bit of
1044 2002-10-31 Dave Love <fx@gnu.org>
1046 * xterm.c (XTread_socket): Fix changes for defined keysyms. Add
1048 (xaw_scroll_callback): Revert last change.
1050 2002-10-30 Kenichi Handa <handa@m17n.org>
1052 * charset.c (Fset_charset_priority): Update
1053 Viso_2022_charset_list.
1055 2002-10-29 Kenichi Handa <handa@m17n.org>
1057 * xfaces.c (Vface_resizing_fonts): New variable.
1058 (struct font_name): New member `resizing_ratio'.
1059 (font_resizing_ratio): New function.
1060 (split_font_name): Set font->resizing_ratio.
1061 (better_font_p): Pay attention to font->resizing_ratio.
1062 (build_scalable_font_name): Likewise. Don't change POINT_SIZE,
1063 RESX, and RESY fields.
1064 (try_alternative_families): Try scalable fonts if
1065 Vscalable_fonts_allowed is not Qt.
1066 (syms_of_xfaces): Declare Vface_resizing_fonts as a Lisp variable.
1068 2002-10-29 Dave Love <fx@gnu.org>
1070 * xterm.c (xaw_scroll_callback): Cast correctly.
1072 2002-10-28 Dave Love <fx@gnu.org>
1074 * keyboard.c (lispy_accent_codes, lispy_accent_keys): Extend.
1075 (lispy_kana_keys): Comment out.
1076 (make_lispy_event) [XK_kana_A]: Comment out.
1078 * xterm.c (xaw_scroll_callback): Cast call_data.
1079 (XTread_socket): Deal with ASCII keysyms.
1080 (syms_of_xterm) <Vx_keysym_table>: Fix args of make_hash_table.
1082 2002-10-27 Dave Love <fx@gnu.org>
1084 * xterm.c (Vx_keysym_table): New.
1085 (syms_of_xterm): Initialize it.
1086 (XTread_socket): Use it.
1087 From head: Eliminate incorrect optimization that tried to avoid
1088 decoding the output of X*LookupString.
1089 (x_get_font_repertory): Delete charset declaration.
1091 2002-10-16 Kenichi Handa <handa@m17n.org>
1093 * coding.c (detect_coding): Fix previous change.
1094 (detect_coding_charset): If only ASCII bytes are found, return 0.
1095 (detect_coding_system): Fix previous change.
1096 (Fdefine_coding_system_internal): Setup CODING_ATTR_ASCII_COMPAT
1099 2002-10-15 Dave Love <fx@gnu.org>
1101 * coding.c (Fcheck_coding_system): Doc fix.
1103 * editfns.c (Finsert_byte): Return a proper value.
1105 2002-10-14 Kenichi Handa <handa@etl.go.jp>
1107 * coding.c (decode_coding): Fix args to translate_chars. Pay
1108 attention to Vstandard_translation_table_for_decode.
1109 (encode_coding): Fix args to translate_chars. Pay attention to
1110 Vstandard_translation_table_for_encode.
1112 * data.c (Faset): Check NEWELT by ASCII_CHAR_P, not by
1115 * editfns.c (general_insert_function): Check VAL by ASCII_CHAR_P,
1116 not by SINGLE_BYTE_CHAR_P.
1118 * fns.c (concat): Check CH by ASCII_CHAR_P, not by
1121 * insdel.c (copy_text): Check C by ASCII_CHAR_P, not by
1124 * keymap.c (Ftext_char_description): Check C by ASCII_CHAR_P, not
1125 by SINGLE_BYTE_CHAR_P.
1127 * search.c (Freplace_match): Check C by ASCII_CHAR_P, not by
1130 2002-10-14 Dave Love <fx@gnu.org>
1132 * fns.c (Fstring_as_multibyte, Fstring_to_multibyte): Doc fix.
1134 2002-10-10 Dave Love <fx@gnu.org>
1136 * fns.c (Flanginfo): Fix typo.
1138 * unexelf.c (unexec): Make last change conditional on Irix 6.5.
1140 2002-10-10 Kenichi Handa <handa@m17n.org>
1142 * coding.c (detect_coding_utf_8): Check incomplete byte sequence.
1143 Don't update *mask when correctly detected.
1144 (detect_coding_utf_16): Likewise.
1145 (detect_coding_emacs_mule): Likewise.
1146 (detect_coding_iso_2022): Likewise.
1147 (detect_coding_sjis): Likewise.
1148 (detect_coding_big5): Likewise.
1149 (detect_coding_ccl): Likewise.
1150 (decode_coding_sjis): Fix decoding of katakana-jisx0201.
1151 (detect_eol): Delete the argument CODING, and add the argument
1153 (detect_coding): Adjusted for the changes above.
1154 (detect_coding_system): Likewise.
1156 2002-10-09 Kenichi Handa <handa@m17n.org>
1158 * character.c (char_string): Renamed from
1159 char_string_with_unification. Pay attention to
1161 (string_char): Renamed from string_char.
1163 * character.h (CHAR_STRING): Call char_string if C is greater than
1165 (CHAR_STRING_ADVANCE): Likewise.
1166 (STRING_CHAR): Call string_char instead of
1167 string_char_with_unification.
1168 (STRING_CHAR_AND_LENGTH): Likewise.
1169 (STRING_CHAR_ADVANCE): Likewise.
1171 2002-10-09 Dave Love <fx@gnu.org>
1173 * coding.c (decode_coding_utf_8): Treat surrogates as invalid.
1175 2002-10-07 Kenichi Handa <handa@m17n.org>
1177 * keymap.c (push_key_description): Pay attention to
1180 * regex.c (re_search_2): Fix for the case of unibyte buffer.
1182 2002-10-06 Dave Love <fx@gnu.org>
1184 * charset.c (define_charset_internal): Rename `supprementary'.
1186 * Makefile.in (lisp, shortlisp): Remove latin-N.
1188 2002-10-05 Dave Love <fx@gnu.org>
1190 * xfns.c (x_window, x_window): Use use_xim.
1192 * xterm.c (use_xim): Initialize.
1193 (xim_open_dpy, xim_initialize, xim_close_dpy): Use use_xim.
1194 (x_term_init): Maybe set use_xim.
1196 * xterm.h (use_xim) [HAVE_X_I18N]: Declare.
1198 2002-10-01 Kenichi Handa <handa@m17n.org>
1200 * search.c (search_buffer): Fix case-fold-search of multibyte
1202 (boyer_moore): Rename the last argument to char_high_bits.
1204 2002-09-27 Kenichi Handa <handa@etl.go.jp>
1206 * xdisp.c (display_string): Fix for the case of zero width glyph.
1208 * xfns.c (x_set_font): Change the error message of the case that
1209 x_new_fontset returns Qt.
1211 * xfaces.c (set_lface_from_font_name): Reject the default fontset.
1212 (Finternal_set_lisp_face_attribute): Use signal_error for the
1213 error of invalid fontset.
1215 * xterm.c (x_new_fontset): If FONTSETNAME specifies the default
1218 2002-09-19 Kenichi Handa <handa@etl.go.jp>
1220 * regex.c (re_search_2): Fix previous change.
1222 2002-09-18 Kenichi Handa <handa@etl.go.jp>
1224 * syntax.c (skip_syntaxes): Fix previous change.
1226 2002-09-13 Kenichi Handa <handa@etl.go.jp>
1228 * syntax.c (skip_chars): Fix previous change.
1229 (skip_syntaxes): Fix previous change.
1231 2002-09-06 Dave Love <fx@gnu.org>
1233 * config.in: Restore it.
1235 2002-09-05 Dave Love <fx@gnu.org>
1237 * config.in: Removed (now auto-generated).
1239 * s/usg5-4.h: Fix last change.
1241 * unexelf.c (unexec): Make .got handling not SGI-specific.
1243 * syntax.c (syms_of_syntax) <multibyte-syntax-as-symbol>: Doc fix.
1245 * regex.c: Use `ifdef HAVE_ALLOCA_H', not `if HAVE_ALLOCA_H'.
1247 * keyboard.c (read_key_sequence): Fix type error.
1249 * buffer.c (Fset_buffer_multibyte, Fset_buffer_multibyte): Fix
1252 * fontset.c (fontset_add): Return Lisp_Object.
1254 2002-09-03 Dave Love <fx@gnu.org>
1256 * charset.h (charset_ordered_list_tick): Declare extern.
1258 2002-09-03 Kenichi Handa <handa@etl.go.jp>
1260 The following changes (and some of 2002-08-20 changes of mine) are
1261 for handling syntax, category, and case conversion for unibyte
1262 characters by converting them to multibyte on the fly. With these
1263 changes, we don't have to setup syntax and case tables for unibyte
1264 characters in each language environment.
1266 * abbrev.c (Fexpand_abbrev): Convert a unibyte character to
1267 multibyte if necessary.
1269 * bytecode.c (Fbyte_code): Likewise.
1271 * character.h (LEADING_CODE_LATIN_1_MIN)
1272 (LEADING_CODE_LATIN_1_MAX): New macros.
1273 (unibyte_to_multibyte_table): Extern it.
1274 (unibyte_char_to_multibyte): New macro.
1275 (MAKE_CHAR_MULTIBYTE): Use unibyte_to_multibyte_table.
1276 (CHAR_LEADING_CODE): New macro.
1277 (FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE): New macro.
1279 * character.c (unibyte_to_multibyte_table): New variable.
1280 (unibyte_char_to_multibyte): Move to character.h and defined as
1282 (multibyte_char_to_unibyte): If C is an eight-bit character,
1283 convert it to the corresponding byte value.
1285 * charset.c (Fset_unibyte_charset): If the dimension of CHARSET is
1286 not 1, singals an error. Update the elements of
1287 unibyte_to_multibyte_table.
1288 (init_charset_once): Initialize unibyte_to_multibyte_table.
1289 (syms_of_charset): Define the charset `iso-8859-1'.
1291 * casefiddle.c (casify_object): Fix previous change.
1293 * cmds.c (internal_self_insert): In a multibyte buffer, insert C
1294 as is without converting it to unibyte. In a unibyte buffer,
1295 convert C to multibyte before checking the syntax.
1297 * lisp.h (unibyte_char_to_multibyte): Extern deleted.
1299 * minibuf.c (Fminibuffer_complete_word): Use the macro
1300 FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE.
1302 * regex.h (struct re_pattern_buffer): New member target_multibyte.
1304 * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
1305 (GET_CHAR_BEFORE_2): Check target_multibyte, not multibyte. If
1306 that is zero, convert an eight-bit char to multibyte.
1307 (MAKE_CHAR_MULTIBYTE, CHAR_LEADING_CODE): New dummy new macros for
1309 (PATFETCH): Convert an eight-bit char to multibyte.
1310 (HANDLE_UNIBYTE_RANGE): New macro.
1311 (regex_compile): Setup the compiled pattern for multibyte chars
1312 even if the given regex string is unibyte. Use PATFETCH_RAW
1313 instead of PATFETCH in many places. To handle `charset'
1314 specification of unibyte, call HANDLE_UNIBYTE_RANGE. Use bitmap
1315 only for ASCII chars.
1316 (analyse_first) <exactn>: Simplified because the compiled pattern
1318 <charset_not>: Setup fastmap from bitmap only for ASCII chars.
1319 <charset>: Use CHAR_LEADING_CODE to get leading codes.
1320 <categoryspec>: If multibyte, setup fastmap only for ASCII chars
1322 (re_compile_fastmap) [emacs]: Call analyse_first with the arg
1324 (re_search_2) In emacs, set the locale variable multibyte to 1,
1325 otherwise to 0. New local variable target_multibyte. Check it
1326 to decide the multibyteness of STR1 and STR2. If
1327 target_multibyte is zero, convert unibyte chars to multibyte
1328 before translating and checking fastmap.
1329 (TARGET_CHAR_AND_LENGTH): New macro.
1330 (re_match_2_internal): In emacs, set the locale variable multibyte
1331 to 1, otherwise to 0. New local variable target_multibyte. Check
1332 it to decide the multibyteness of STR1 and STR2. Use
1333 TARGET_CHAR_AND_LENGTH to fetch a character from D.
1334 <charset, charset_not>: If multibyte is nonzero, check fastmap
1335 only for ASCII chars. Call bcmp_translate with
1336 target_multibyte, not with multibyte.
1337 <begline>: Declare the local variable C as `unsigned'.
1338 (bcmp_translate): Change the last arg name to target_multibyte.
1340 * search.c (compile_pattern_1): Don't adjust the multibyteness of
1341 the regexp pattern and the matching target. Set cp->buf.multibyte
1342 to the multibyteness of the regexp pattern. Set
1343 cp->but.target_multibyte to the multibyteness of the matching
1345 (wordify): Use FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE instead of
1346 FETCH_STRING_CHAR_ADVANCE.
1347 (Freplace_match): Convert unibyte chars to multibyte.
1349 * syntax.c (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
1350 unibyte chars to multibyte.
1351 (back_comment): Likewise.
1352 (scan_words): Likewise.
1353 (skip_chars): The arg syntaxp is deleted, and the code for
1354 handling syntaxes is moved to skip_syntaxes. Callers changed.
1355 Fix the case that the multibyteness of STRING and the current
1356 buffer doesn't match.
1357 (skip_syntaxes): New function.
1358 (SYNTAX_WITH_MULTIBYTE_CHECK): Check C by ASCII_CHAR_P, not by
1360 (Fforward_comment): Use FETCH_CHAR_AS_MULTIBYTE to convert unibyte
1362 (scan_lists): Likewise.
1363 (Fbackward_prefix_chars): Likewise.
1364 (scan_sexps_forward): Likewise.
1366 2002-08-23 Kenichi Handa <handa@etl.go.jp>
1368 * xfaces.c (QCfontset): New variable.
1369 (LFACE_FONTSET): New macro.
1370 (check_lface_attrs): Check also LFACE_FONTSET_INDEX.
1371 (set_lface_from_font_name): Setup LFACE_FONTSET (lface).
1372 (Finternal_set_lisp_face_attribute): Handle QCfontset.
1373 (Finternal_get_lisp_face_attribute): Likewise.
1374 (lface_same_font_attributes_p): Fix checking of LFACE_FONT_INDEX,
1375 check also LFACE_FONTSET_INDEX.
1376 (face_fontset): Check attrs[LFACE_FONTSET_INDEX], not
1377 attrs[LFACE_FONT_INDEX].
1378 (syms_of_xfaces): Intern and staticpro QCfontset.
1380 * dispextern.h (enum lface_attribute_index): New member
1381 LFACE_FONTSET_INDEX.
1383 * fns.c (base64_encode_1): Handle eight-bit chars correctly.
1385 2002-08-21 Kenichi Handa <handa@etl.go.jp>
1387 * coding.c (coding_set_destination): Fix coding->destination for
1388 the case converting a region.
1389 (encode_coding_utf_8): Encode eight-bit chars as single byte.
1390 (encode_coding_object): Fix coding->dst_pos and
1391 coding->dst_pos_byte for the case converting a region.
1393 * insdel.c (insert_from_gap): Make it work even if PT != GTP.
1395 * character.h (BYTE8_STRING): New macro.
1397 * fns.c (base64_decode_1): Insert eight-bit chars correctly.
1399 2002-08-20 Kenichi Handa <handa@etl.go.jp>
1401 * xdisp.c (get_next_display_element): Don't display unibyte 8-bit
1402 characters by octal form.
1404 * abbrev.c (Fexpand_abbrev): Fix for the multibyte case.
1406 * buffer.h (_fetch_multibyte_char_len): Extern deleted.
1407 (FETCH_MULTIBYTE_CHAR): Don't use _fetch_multibyte_char_len.
1408 (BUF_FETCH_MULTIBYTE_CHAR): Likewise.
1409 (FETCH_CHAR_AS_MULTIBYTE): New macro.
1411 * casetab.c (set_canon, set_identity, shuffle): Simplified.
1413 * casefiddle.c (casify_object): Simplified. Handle the case that
1414 the case conversion change the byte length.
1415 (casify_region): Likewise
1417 * character.h (MAKE_CHAR_UNIBYTE, MAKE_CHAR_MULTIBYTE): New
1420 * character.c (_fetch_multibyte_char_len): This variable deleted.
1421 (syms_of_character): Setup Vprintable_chars.
1423 * editfns.c (Fchar_equal): Fix for the unibyte case.
1424 (Finsert_byte): New function.
1425 (syms_of_editfns): Defsubr it.
1427 * keyboard.c (read_key_sequence): Use ~CHAR_MODIFIER_MASK instead
1428 of direct code 0x3ffff.
1430 * search.c (Freplace_match): Fix for the unibyte case.
1432 2002-08-19 Kenichi Handa <handa@etl.go.jp>
1434 * lread.c (safe_to_load_p): Fix the logic.
1436 * syntax.c (scan_words): Don't treat characters belonging to
1437 different scripts as constituting a word.
1439 * editfns.c (Fformat): Use ASCII_CHAR_P, not SINGLE_BYTE_CHAR_P.
1441 * fontset.c (Fset_fontset_font): Treat `ascii' as charset, not
1444 * emacs.c (main): In the case of --unibyte, instead of aborting on
1445 finding non-empty buffer, make it unibyte.
1447 2002-08-18 Kenichi Handa <handa@etl.go.jp>
1449 * xterm.c (x_new_fontset): Call `create-fontset-from-ascii-font'
1450 to create a fontset.
1452 2002-08-18 Dave Love <fx@gnu.org>
1454 * character.c (Funibyte_char_to_multibyte): Doc fix.
1456 * xfns.c [HAVE_STDLIB_H]: Fix last change.
1458 2002-08-15 Kenichi Handa <handa@etl.go.jp>
1460 * fontset.c (fontset_add): Make the type `int'.
1461 (fontset_id_valid_p): Define it if FONTSET_DEBUG is defined.
1463 * character.c (unibyte_char_to_multibyte): Refer to
1464 charset_unibyte, not charset_primary.
1465 (multibyte_char_to_unibyte): Likewise.
1466 (Funibyte_char_to_multibyte): Likewise.
1468 * charset.h: (charset_unibyte): Extern it instead of
1471 * charset.c (charset_unibyte): Renamed from charset_primary.
1472 (Funibyte_charset): Renamed from Fprimary_charset.
1473 (Fset_unibyte_charset): Renamed from Fset_primary_charset.
1474 (syms_of_charset): Adjusted for the above changes.
1476 * w32term.c (x_produce_glyphs): Use ASCII_CHAR_P, not
1477 SINGLE_BYTE_CHAR_P. Fix the logic of handling non-ASCII char when
1478 it->multibyte_p is zero.
1480 * lisp.h (nonascii_insert_offset, Vnonascii_translation_table):
1483 2002-08-08 Kenichi Handa <handa@etl.go.jp>
1485 * coding.c (Fdefine_coding_system_internal): Fix category setting
1486 for a coding system of type iso-2022.
1488 2002-08-02 Kenichi Handa <handa@etl.go.jp>
1490 * fontset.h (FS_LOAD_FONT): Call fs_load_font with the arg CHARSET
1493 2002-08-01 Kenichi Handa <handa@etl.go.jp>
1495 * syntax.c (Vnext_word_boundary_function_table): New variable.
1496 (syms_of_syntax): Declare it as a Lisp variable.
1497 (scan_words): Call functions in Vnext_word_boundary_function_table
1500 * xterm.c (x_load_font): Initialize fontp->fontset to -1.
1502 * fontset.c (fs_load_font): If fontp->charset is not negative,
1503 return fontp without setting its members.
1505 2002-07-31 Dave Love <fx@gnu.org>
1507 * config.in: Generated with autoheader.
1509 * xfns.c [HAVE_STDLIB_H]: Change logic (instead of fixing typo).
1511 * m/sparc.h (HAVE_ALLOCA): Delete.
1513 * s/irix6-5.h: Don't include strings.h.
1514 (bcopy, bzero, bcmp): Don't undef.
1516 * s/irix6-0.h (bcopy, bzero, bcmp): Don't undef.
1518 * s/usg5-4.h (NO_SIOCTL_H): Don't define.
1519 (TIOCSIGSEND): Don't test IRIX6.
1520 (bcopy, bzero, bcmp): Define conditionally.
1522 2002-07-31 Kenichi Handa <handa@etl.go.jp>
1524 * buffer.c (Qas, Qmake, Qto): New variables.
1525 (Fset_buffer_multibyte): New optional arg METHOD. Caller changed.
1526 (syms_of_buffer): Intern and staticpro Qas, Qmake, and Qto.
1528 * callproc.c (Fcall_process): Don't call insert_1_both directly if
1529 we are inserting a process output into a multibyte buffer.
1531 * character.h (CHAR_TO_BYTE8): If C is not eight-bit char, call
1532 multibyte_char_to_unibyte.
1534 * character.c (Funibyte_char_to_multibyte): If C can't be decoded
1535 by the primary charset, make it eight-bit char.
1536 (Fmultibyte_char_to_unibyte): Call CHAR_TO_BYTE8.
1538 * charset.c: (charset_eight_bit, Qeight_bit_control): New
1540 (charset_8_bit__control, charset_8_bit_graphic,
1541 Qeight_bit_control, Qeight_bit_graphic): These variables deleted.
1542 (define_charset_internal): New function.
1543 (syms_of_charset): Call define_charset_internal for pre-defined
1546 * charset.h (charset_8_bit): Extern it.
1548 * coding.c (make_conversion_work_buffer): Adjusted for the change
1549 of Fset_buffer_multibyte.
1550 (encode_coding_raw_text): Increment p0 in the loop.
1552 * lisp.h (Fset_buffer_multibyte): Prototype adjusted.
1554 * xdisp.c (setup_echo_area_for_printing, set_message_1): Adjusted
1555 for the change of Fset_buffer_multibyte.
1557 * fns.c (Fstring_to_multibyte): New function.
1558 (syms_of_fns): Declare Fstring_to_multibyte as Lisp subroutine.
1560 2002-07-30 Dave Love <fx@gnu.org>
1562 * xfns.c (x_put_x_image): Declare args.
1564 * xfaces.c (font_name_registry, choose_face_font): Delete unused
1566 (try_font_list): Declare an arg.
1568 * xdisp.c (message2_nolog, set_message): Declare an arg.
1570 * terminfo.c (tparam): Declare an arg. Use P_ to declare tparm.
1572 * syntax.c (scan_sexps_forward): Declare an arg.
1574 * scroll.c (calculate_scrolling, calculate_direct_scrolling):
1577 * lisp.h (Fnew_fontset): Declare.
1579 * keymap.c (push_key_description): Call CHARACTERP correctly.
1581 * fontset.c (fontset_add): Declare args. Call make_number
1583 (face_for_char): Delete unused vars.
1584 (Fset_fontset_font): Doc fix. Delete unused vars.
1586 * doc.c (Fsubstitute_command_keys): Delete unused vars.
1588 * composite.c (update_compositions): Declare arg.
1590 * cm.c (calccost, cmgoto): Declare args.
1592 * charset.c: Remove `emacs' conditional. Doc fixes.
1593 (map_char_table_for_charset): Declare.
1595 * character.c (syms_of_character) <translation-table-vector>: Doc
1598 * ccl.c: Remove `emacs' conditional. Include hash table stuff
1601 2002-07-26 Kenichi Handa <handa@etl.go.jp>
1603 The following changes are to allow specifying multiple font
1604 patterns for a character range (specified by script or charset).
1606 * Makefile.in (abbrev.o): Depend on syntax.h.
1607 (xfaces.o): Depend on charset.h.
1609 * alloc.c (Fmake_string): Use ASCII_CHAR_P, not
1612 * ccl.c (Fccl_execute_on_string): Add `const' to local variables.
1614 * character.h (Vchar_script_table): Extern it.
1616 * character.c (Vscript_alist): This variable deleted.
1617 (Vchar_script_table, Qchar_script_table): New variable.
1618 (syms_of_character): Declare Vchar_script_table as a lisp variable
1621 * chartab.c (Fmake_char_table): Doc fixed. If PURPOSE doesn't
1622 have property char-table-extra-slots, make no extra slot.
1624 * dispextern.h (struct face): Member `charset' deleted.
1625 (FACE_SUITABLE_FOR_CHAR_P): Use ASCII_CHAR_P, not
1627 (FACE_FOR_CHAR): Likewise.
1628 (choose_face_font, lookup_non_ascii_face, font_name_registry): Add
1630 (lookup_face, lookup_named_face, lookup_derived_face): Prototype
1632 (generate_ascii_font_name): Renamed from generate_ascii_font.
1634 * fontset.h (get_font_repertory_func): New prototype.
1635 (make_fontset_for_ascii_face, fs_load_font): Prototypes fixed.
1636 (FS_LOAD_FONT): Call fs_load_font with the 3rd arg charset_ascii.
1638 * fontset.c (Qprepend, Qappend): New variables.
1639 (FONTSET_CHARSET_ALIST, FONTSET_FACE_ALIST): These macros deleted.
1640 (FONTSET_NOFONT_FACE, FONTSET_REPERTORY): New macros.
1641 (FONTSET_REF): Optimize if FONTSET is Vdefault_fontset.
1642 (FONTSET_REF_AND_RANGE, FONTSET_ADD): New macros.
1643 (fontset_ref_and_range, fontset_add, reorder_font_vector)
1644 (load_font_get_repertory): New functions.
1645 (fontset_set): This function deleted.
1646 (fontset_face): New arg FACE. Return face ID, not face.
1647 Completely re-written to handle new fontset structure. Caller
1649 (free_face_fontset): Use ASET istead of AREF (X) = Y.
1650 (face_for_char): Don't call lookup_face.
1651 (make_fontset_for_ascii_face): New arg FACE.
1652 (fs_load_font): New arg CHARSET_ID. Don't check
1653 Vfont_encoding_alist here.
1654 (find_font_encoding): New function.
1655 (list_fontsets): Use STRINGP, not ! NILP.
1656 (accumulate_script_ranges): New function.
1657 (Fset_fontset_font, Fnew_fontset, Ffontset_info): Completely
1658 re-written to handle new fontset structure.
1659 (Ffontset_font): Return a copy of element.
1660 (syms_of_fontset): Define symbols Qprepend and Qappend. Fix
1661 docstring of font-encoding-alist.
1663 * lisp.h (CHAR_TABLE_REF): Remove unnecessary check (IDX >= 0).
1664 (Fset_fotset_font): Fix arguments to 5.
1666 * msdos.c (XMenuActivate): Adjuted for the change of
1667 lookup_derived_face.
1669 * xdisp.c (message_dolog, set_message_1, extend_face_to_end_of_line):
1670 Use ASCII_CHAR_P, not SINGLE_BYTE_CHAR_P.
1671 (highlight_trailing_whitespace): Adjusted for the change of
1674 * xfaces.c: Include charset.h.
1675 (load_face_font): Argument C deleted. Caller changed.
1676 (generate_ascii_font_name): Renamed from generate_ascii_font.
1677 (font_name_registry): New function.
1678 (cache_face): Store ascii faces before non-ascii faces in buckets.
1679 (lookup_face): Arguments C and BASE_FACE deleted. Caller changed.
1680 Lookup only ascii faces.
1681 (lookup_non_ascii_face): New function.
1682 (lookup_named_face): Argument C deleted. Caller changed.
1683 (lookup_derived_face): Argument C deleted. Caller changed.
1684 (try_font_list): New arg PATTERN. Caller changed. If PATTERN is
1685 a string, just call font_list with it.
1686 (choose_face_font): Arguments FACE and C deleted. New arg
1687 FONT_SPEC. Caller changed.
1688 (realize_face): Arguments C and BASE_FACE deleted. Caller
1689 (realize_x_face): Likewise.
1690 (realize_non_ascii_face): New function.
1691 (realize_x_face): Call load_face_font here.
1692 (realize_tty_face): Argument C deleted. Caller changed.
1693 (compute_char_face): If CH is not ascii, call FACE_FOR_CHAR to
1695 (dump_realized_face): Don't print charset of FACE.
1697 * xfns.c (x_set_font): Always call x_new_fontset and
1698 store_frame_parameter.
1699 (Fx_create_frame): Call x_new_fontset, not x_new_font.
1700 (syms_of_xfns): Set get_font_repertory_func to
1701 x_get_font_repertory.
1703 * xterm.h (x_get_font_repertory): Extern it.
1705 * xterm.c (x_produce_glyphs): Use ASCII_CHAR_P, not
1706 SINGLE_BYTE_CHAR_P. Fix the logic of handling non-ASCII char when
1707 it->multibyte_p is zero.
1708 (XTread_socket): Use ASCII_CHAR_P, not SINGLE_BYTE_CHAR_P.
1709 (x_new_fontset): If FONTSETNAME doesn't match any existing
1710 fontsets, create a new one.
1711 (x_get_font_repertory): New function.
1713 2002-07-25 Kenichi Handa <handa@etl.go.jp>
1715 * coding.c (Ffind_coding_systems_region_internal): Detect an
1716 ASCII only string correctly.
1718 * lread.c (Fload): Don't load with Qload_force_doc_strings t if
1721 2002-07-24 Kenichi Handa <handa@etl.go.jp>
1723 * lread.c: Include "coding.h".
1724 (Qget_emacs_mule_file_char, Qload_force_doc_strings,
1725 load_each_byte, unread_char): New variables.
1726 (readchar_backlog): This variable deleted.
1727 (readchar): Return a character unless load_each_byte is nonzero.
1728 Handle the case that readcharfun is Qget_emacs_mule_file_char or a
1729 cons. If unread_char is not -1, simply return it.
1730 (unreadchar): Handle the case that readcharfun is
1731 Qget_emacs_mule_file_char or a cons. Set unread_char if
1733 (read_multibyte): This function deleted.
1734 (readbyte_for_lambda, readbyte_from_file, readbyte_from_string)
1735 (read_emacs_mule_char): New functions.
1736 (Fload): Even if the file doesn't have the extention ".elc", if
1737 safe_to_load_p returns a positive version number, assume that the
1738 file contains bytecompiled code. If the version is less than 22,
1739 load the file while decoding multibyte sequences by emacs-mule.
1740 (readevalloop): Don't use readchar_backlog.
1741 (Fread): Likewise. Pay attention to the case that STREAM is a
1743 (Fread_from_string): Pay attention to the case that STREAM is a
1745 (read_escape): The arg BYTEREP deleted.
1746 (read1): Set load_each_byte to 1 temporarily while handling
1747 #@NUMBER. Don't call read_multibyte.
1748 (read_vector): Call Fread with a cons. If readcharfun is
1749 Qget_emacs_mule_file_char, decode the read string by emacs-mule.
1750 (read_list): If doc_reference is 2, make the cdr part string as
1752 (syms_of_lread): Intern and staticpro Qget_emacs_mule_file_char
1753 and Qload_force_doc_strings.
1755 2002-07-23 Kenichi Handa <handa@etl.go.jp>
1757 * xdisp.c (face_before_or_after_it_pos): Call
1758 FETCH_MULTIBYTE_CHAR with byte postion, not char position.
1760 2002-07-22 Kenichi Handa <handa@etl.go.jp>
1762 * character.h (TRAILING_CODE_P): New macro.
1763 (MAYBE_UNIFY_CHAR): Adjusted for the change of Funify_charset.
1764 (string_char_with_unification): Fix prototype.
1765 (Vscript_alist): Extern it.
1767 * character.c (Vscript_alist): New variable.
1768 (string_char_with_unification): Add `const' to local variables.
1769 (str_as_unibyte): Likewise.
1770 (string_escape_byte8): Likewise.
1771 (syms_of_character): Declare script-alist as a Lisp variable.
1773 * charset.h (Vcharset_ordered_list): Extern it.
1774 (charset_ordered_list_tick): Extern it.
1775 (EMACS_MULE_LEADING_CODE_PRIVATE_11)
1776 (EMACS_MULE_LEADING_CODE_PRIVATE_12)
1777 (EMACS_MULE_LEADING_CODE_PRIVATE_21)
1778 (EMACS_MULE_LEADING_CODE_PRIVATE_22): New macros
1779 (Funify_charset): Adjusted for the change of Funify_charset.
1781 * charset.c (charset_ordered_list_tick): New variable.
1782 (Fdefine_charset_internal): Increment charset_ordered_list_tick.
1783 (Funify_charset): New optional arg DEUNIFY. If it is non-nil,
1784 deunify intead of unify a charset.
1785 (string_xstring_p): Add `const' to local variables.
1786 (find_charsets_in_text): Add `const' to arguemnts and local
1788 (encode_char): Adjusted for the change of Funify_charset. Fix
1789 detecting of invalid code.
1790 (Fset_charset_priority): Increment charset_ordered_list_tick.
1791 (Fmap_charset_chars): Fix handling of default value for FROM_CODE
1794 * coding.c (LEADING_CODE_PRIVATE_11, LEADING_CODE_PRIVATE_12)
1795 (LEADING_CODE_PRIVATE_21, LEADING_CODE_PRIVATE_22): Macros
1796 deleted. Callers changed to use
1797 EMACS_MULE_LEADING_CODE_PRIVATE_11, etc.
1798 (decode_coding_ccl): Add `const' to local variables.
1799 (consume_chars): Likewise.
1800 (Ffind_coding_systems_region_internal): Likewise.
1801 (Fcheck_coding_systems_region): Likewise.
1803 * print.c (print_object): Use octal form for printing the
1804 contents of a bool vector.
1806 2002-07-18 Dave Love <fx@gnu.org>
1808 * lread.c (Fload) <!load_dangerous_libraries>: Don't leak fd.
1809 <version == 20>: Refuse to load.
1811 2002-07-17 Dave Love <fx@gnu.org>
1813 * fns.c: Move coding.h.
1814 (Qcodeset, Qdays, Qmonths): New.
1815 (concat): Use CHARACTERP instead of INTERGERP.
1816 (Flocale_codeset): Deleted.
1817 (Flanginfo): New function.
1818 (syms_of_fns): Changed accordingly.
1820 * coding.c (adjust_coding_eol_type): Fix eol_type/eol_seen mixup.
1822 2002-07-16 Dave Love <fx@gnu.org>
1824 * casetab.c (init_casetab_once, init_casetab_once): Fix
1825 CHAR_TABLE_SET call.
1827 * category.c (Fmodify_category_entry): Fix CATEGORY_MEMBER call.
1829 * character.c (syms_of_character): Fix CHAR_TABLE_SET call.
1831 * charset.c (Fmap_charset_chars): Check args. Convert Lisp types.
1832 (load_charset_map, Fdeclare_equiv_charset, Fencode_char)
1833 (Fset_charset_priority, syms_of_charset): Convert Lisp types.
1835 * charset.h (CHECK_CHARSET_GET_ID): Use XINT on AREF result.
1837 * coding.c (ENCODE_DESIGNATION, decode_eol)
1838 (make_conversion_work_buffer, code_conversion_restore)
1839 (Fdefine_coding_system_internal): Convert Lisp types.
1840 (code_conversion_restore): Use EQ, not ==.
1841 (Fencode_coding_string): Fix code_convert_string call.
1843 * coding.h (code_convert_region): Fix prototype.
1845 * dispextern.h (redraw_frame, redraw_garbaged_frames): Removed.
1847 * fontset.c (fontset_ref, fontset_set, fs_load_font)
1848 (Ffontset_info): Convert Lisp types.
1850 * syntax.h (SYNTAX_ENTRY_INT): Don't use make_number.
1852 * xterm.c (note_mouse_movement): Fix call of window_from_coordinates.
1854 * xdisp.c (display_mode_element): Fix call of Fset_text_properties.
1856 * chartab.c: Include "...h", not <...h> in some cases.
1858 * callproc.c (Fcall_process): Remove unused variables.
1860 2002-07-12 Dave Love <fx@gnu.org>
1862 * coding.c (Fset_coding_system_priority): Allow null arg list.
1864 2002-07-03 Dave Love <fx@gnu.org>
1866 * minibuf.c (Fminibuffer_complete_word): Remove unused var.
1867 (Fself_insert_and_exit): Use CHARACTERP.
1869 * callproc.c (Fcall_process): Remove unused vars.
1871 * xterm.c (XTread_socket): Add extra dead keysyms.
1873 * xdisp.c (decode_mode_spec_coding): Use CHARACTERP.
1875 * dispextern.h: Remove prototypes for redraw_frame,
1876 redraw_garbaged_frames.
1878 * cmds.c (Fself_insert_command): Use CHARACTERP.
1880 * chartab.c (make_sub_char_table): Remove unused var.
1881 (Fset_char_table_default, Fmap_char_table): Doc fix.
1883 * keymap.c (access_keymap): Remove generic char code.
1884 (push_key_description): Use CHARACTERP.
1886 2002-07-01 Dave Love <fx@gnu.org>
1888 * charset.c: Doc fixes.
1889 (Funify_charset): Extra checking.
1891 2002-06-24 Dave Love <fx@gnu.org>
1893 * lread.c: Remove some unused variables.
1894 (safe_to_load_p): If safe, return the magic number version byte.
1895 (Fload): Maybe use load-with-code-conversion.
1897 2002-06-12 Kenichi Handa <handa@etl.go.jp>
1899 * category.c (Fmodify_category_entry): Don't modify the contents
1900 of category_set for characters out of the range. Avoid
1901 unnecessary modification.
1903 * character.h (MAYBE_UNIFY_CHAR): Adjusted for the change of
1904 Vchar_unify_table. The default value of the table is now nil.
1906 * character.c (syms_of_character): Setup Vchar_width_table for
1907 eight-bit-control and raw-byte chars.
1909 * charset.h (enum define_charset_arg_index): Delete
1910 charset_arg_parents and add charset_arg_subset and
1911 charset_arg_superset.
1912 (enum charset_attr_index): Delete charset_parents and add
1913 charset_subset and charset_superset.
1914 (enum charset_method): Delete CHARSET_METHOD_INHERIT and add
1915 CHARSET_METHOD_SUBSET and CHARSET_METHOD_SUPERSET.
1916 (CHARSET_ATTR_PARENTS, CHARSET_PARENTS): Macros deleted.
1917 (CHARSET_ATTR_SUBSET, CHARSET_ATTR_SUPERSET, CHARSET_SUBSET)
1918 (CHARSET_SUPERSET): New macros.
1919 (charset_work): Extern it.
1920 (ENCODE_CHAR): Use charset_work.
1921 (CHAR_CHARSET_P): Adjusted for the change of encoder format.
1922 (map_charset_chars): Extern it.
1924 * charset.c (load_charset_map): Set the default value of encoder
1925 and deunifier char-tables to nil.
1926 (map_charset_chars): Argument changed. Callers changed. Use
1927 map_char_table_for_charset instead of map_char_table.
1928 (Fmap_charset_chars): New optional args from_code and to_code.
1929 (Fdefine_charset_internal): Adjusted for the change of
1930 `define-charset' (:parents -> :subset or :superset).
1931 (charset_work): New variable.
1932 (encode_char): Adjusted for the change of
1933 Fdefine_charset_internal.
1934 (syms_of_charset): Likewise.
1935 (Ffind_charset_string): Setup the vector `charsets' correctly.
1937 * chartab.c (sub_char_table_ref_and_range): New arg defalt. Fix
1938 the previous change.
1939 (char_table_ref_and_range): Adjusted for the above change.
1940 (map_sub_char_table_for_charset): New function.
1941 (map_char_table_for_charset): New function.
1943 * keymap.c (describe_vector): Handle a char-table directly here.
1944 (describe_char_table): Deleted.
1946 * lisp.h (map_charset_chars): Deleted.
1948 2002-06-11 Dave Love <fx@gnu.org>
1950 * fns.c (count_combining): Comment out (unused).
1951 (Flocale_codeset): New.
1952 (syms_of_fns): Defsubr it.
1954 * config.in (HAVE_PTY_H, HAVE_SIZE_T, HAVE_LANGINFO_CODESET): New.
1957 2002-06-06 Dave Love <fx@gnu.org>
1959 * Makefile.in (chartab.o): Depend on charset.h
1961 2002-06-03 Kenichi Handa <handa@etl.go.jp>
1963 * character.c (syms_of_character): Set the default value of
1964 Vprintable_chars to Qnil.
1966 2002-05-31 Dave Love <fx@gnu.org>
1968 * Makefile.in (lisp, shortlisp): Change indian.elc to indian.el.
1970 2002-05-31 Kenichi Handa <handa@etl.go.jp>
1972 * charset.c (load_charset_map): Handle the case that from < to
1975 * coding.c (encode_coding_emacs_mule): Pay attention to raw-8-bit
1977 (encode_coding_iso_2022): Likewise.
1978 (encode_coding_sjis): Likewise.
1979 (encode_coding_big5): Likewise.
1980 (encode_coding_charset): Likewise.
1982 2002-05-30 Kenichi Handa <handa@etl.go.jp>
1984 * Makefile.in (lisp): Change chinese.elc to chinese.el. They are
1985 not bytecompiled now.
1986 (shortlisp): Likewise.
1988 * charset.c (charset_jisx0201_roman, charset_jisx0208_1978)
1989 (charset_jisx0208): New variables.
1990 (Fdefine_charset_internal): Setup them if appropriate.
1991 (init_charset_once): Initialize them to -1.
1993 * charset.h (charset_jisx0201_roman, charset_jisx0208_1978,
1994 charset_jisx0208): Extern them.
1996 * coding.c (CODING_ISO_FLAG_USE_ROMAN): New macro
1997 (CODING_ISO_FLAG_USE_OLDJIS): New macro.
1998 (CODING_ISO_FLAG_FULL_SUPPORT): Macro definition changed.
1999 (setup_iso_safe_charsets): Fix arguemtns to Fassq.
2000 (DECODE_DESIGNATION): Pay attention to CODING_ISO_FLAG_USE_ROMAN
2001 and CODING_ISO_FLAG_USE_OLDJIS.
2002 (ENCODE_ISO_CHARACTER_DIMENSION1): Likewise.
2003 (ENCODE_ISO_CHARACTER_DIMENSION2): Likewise.
2004 (encode_coding_iso_2022): Change the 1st arg to
2005 ENCODE_ISO_CHARACTER to a variable.
2007 2002-05-29 Kenichi Handa <handa@etl.go.jp>
2009 * charset.h (enum define_charset_arg_index): New enums
2010 charset_arg_min_code and charset_arg_max_code.
2011 (struct charset): New member char_index_offset.
2013 * charset.c (CODE_POINT_TO_INDEX): Take charset->char_index_offset
2015 (INDEX_TO_CODE_POINT): Likewise.
2016 (Fdefine_charset_internal): Handle args[charset_arg_min_code] and
2017 args[charset_arg_max_code]. Setup charset.char_index_offset.
2018 (syms_of_charset): Fix args to Fdefine_charset_internal.
2020 2002-05-27 Dave Love <fx@gnu.org>
2022 * coding.c (decode_coding_utf_8): Reject overlong sequences.
2024 2002-05-26 Dave Love <fx@gnu.org>
2026 * coding.c: Doc fixes.
2027 (Fcoding_system_aliases): Fix return value.
2028 (Qmac): Remove (duplicated) definition.
2030 2002-05-25 Dave Love <fx@gnu.org>
2032 * charset.c (Fcharset_priority_list, Fset_charset_priority): New
2035 * character.c (Fstring): Doc fix.
2037 * charset.c (Fdefine_charset_alias): Update Vcharset_list.
2039 * fontset.c (Ffontset_info): Doc fix. Return charset names, not
2041 (font-encoding-alist): Doc fix.
2043 2002-05-24 Dave Love <fx@gnu.org>
2045 * term.c (costs_set): Declare static, non-initialized for pcc.
2046 (encode_terminal_code): Remove ensued var.
2048 * keyboard.c (kbd_buffer_store_event): Fix interrupt_signal decl
2051 * xterm.c (xlwmenu_window_p): Fix prototype for K&R.
2053 * coding.c (setup_iso_safe_charsets): Fix arg decl for K&R.
2054 (suffixes): Moved out of make_subsidiaries for K&R.
2056 * charset.c (map_charset_chars): Fix c_function declaration for
2059 * lisp.h (DEFUN) [!PROTOTYPES]: Remove spurious `args'.
2061 2002-05-23 Dave Love <fx@gnu.org>
2063 * data.c (Fchar_or_string_p): Doc fix. Use CHARACTERP.
2065 * category.c (Fmodify_category_entry): Doc fix. Remove unused
2068 2002-05-23 Yong Lu <lyongu@asia-infonet.com>
2070 * charset.c (Fdefine_charset_internal): Fix argument to bzero.
2072 * coding.c (Fdefine_coding_system_internal): Fix previous change.
2073 (decode_coding_charset): Workaround for the bug of GCC 2.96.
2075 2002-05-23 Kenichi Handa <handa@etl.go.jp>
2077 * Makefile.in (lisp): Change cyrillic.elc to cyrillic.el,
2078 vietnamese.elc to vietnamese.el. They are not bytecompiled now.
2079 (shortlisp): Likewise.
2081 2002-05-22 Kenichi Handa <handa@etl.go.jp>
2083 * coding.c (decode_coding_charset): Adjusted for the change of
2084 Fdefine_coding_system_internal.
2085 (Fdefine_coding_system_internal): For a coding system of
2086 `charset' type, store a list of charset IDs in
2087 `charset_attr_charset_valids' element of coding attributes.
2089 * charset.c (Fmake_char): Fix previous change.
2091 2002-05-21 Kenichi Handa <handa@etl.go.jp>
2093 * coding.c (ONE_MORE_BYTE_NO_CHECK): Increment consumed_chars.
2094 (emacs_mule_char): New arg src. Delete arg `composition'. Caller
2095 changed. Handle 2-byte and 3-byte charsets correctly.
2096 (DECODE_EMACS_MULE_COMPOSITION_RULE_20): Renamed from
2097 DECODE_EMACS_MULE_COMPOSITION_RULE. Caller changed.
2098 (DECODE_EMACS_MULE_COMPOSITION_RULE_21): New macro.
2099 (DECODE_EMACS_MULE_21_COMPOSITION): Call
2100 DECODE_EMACS_MULE_COMPOSITION_RULE_21. Produce correct annotation
2102 (decode_coding_emacs_mule): Handle composition correctly. Rewind
2103 `src' and `consumed_chars' correctly before calling
2105 (DECODE_COMPOSITION_START): Correctly handle the case of altchar
2106 and alt&rule composition.
2107 (decode_coding_iso_2022): Handle composition correctly.
2108 (init_coding_once): Setup emacs_mule_bytes for private charsets.
2110 * charset.c (Fdefine_charset_internal): Fix bug for the case of
2111 re-defining a charset. If the charset has :emacs-mule-id, setup
2113 (Fmake_char): If CODE1 is nil, use the minimum code of the
2116 2002-05-20 Kenichi Handa <handa@etl.go.jp>
2118 * coding.c (encode_coding_iso_2022): If coding requires safe
2119 encoding, produce a character specified by
2120 CODING_INHIBIT_CHARACTER_SUBSTITUTION.
2121 (encode_coding_sjis): Likewise.
2122 (encode_coding_big5): Likewise.
2123 (encode_coding_charset): Likewise.
2125 2002-05-17 Dave Love <fx@gnu.org>
2127 * xterm.c (XSetIMValues): Declare.
2129 * process.c: Conditionally include sys/wait.h, pty.h.
2131 * print.c (print_object): Fix print format for 64-bit
2134 * keyboard.c (modify_event_symbol): Fix print format for 64-bit
2137 * buffer.c (emacs_strerror): Declare.
2138 (MMAP_ALLOCATED_P, mmap_enlarge, syms_of_buffer): Import changes
2141 * fontset.c (Fclear_face_cache): Declare.
2142 (accumulate_font_info): Commented-out (unused).
2143 (face_for_char, Fset_fontset_font, Ffontset_info): Remove unused
2146 * character.h (string_escape_byte8): Declare.
2148 * charset.c (load_charset_map, load_charset_map_from_file): Remove
2150 (Fdefine_charset_internal, Fsplit_char, syms_of_charset)
2151 (Fmap_charset_chars): Doc fix.
2153 * coding.c (Vchar_coding_system_table, Qchar_coding_system):
2155 (Fset_coding_system_priority, Fset_coding_system_priority)
2156 (Fdefine_coding_system_internal): Doc fix.
2158 2002-05-16 Dave Love <fx@gnu.org>
2160 * s/osf5-0.h (C_SWITCH_SYSTEM) [!__GNUC__]: Remove -nointrinsics.
2162 2002-05-16 Kenichi Handa <handa@etl.go.jp>
2164 * character.c (string_escape_byte8): Make multibyte string with
2167 * charset.c (Fmake_char): Delete unnecessary code.
2169 2002-05-14 Kenichi Handa <handa@etl.go.jp>
2171 * xfns.c (x_encode_text): Allocate coding.destination here, and
2172 call encode_coding_object with dst_object Qnil.
2174 * buffer.c (Fset_buffer_multibyte): Convert 8-bit bytes to
2175 multibyte form correctly.
2177 * fontset.c (fs_load_font): Check fontp->full_name (not fontname)
2178 against Vfont_encoding_alist.
2180 * coding.c (Fdecode_sjis_char): Fix typo (0x7F->0xFF). Fix the
2181 handling of charset list.
2182 (encode_coding_iso_2022): Setup coding->safe_charsets in advance.
2183 (decode_coding_object): Move point to coding->dst_pos before
2184 calling post-read-conversion function.
2185 (encode_coding_object): Give correct arguments to
2186 pre-write-conversion. Ignore the return value of
2187 pre-write-conversion function. Pay attention to the case that
2188 pre-write-conversion changes the current buffer. If dst_object is
2189 Qt, even if coding->src_bytes is zero, allocate at least one byte
2190 to coding->destination.
2192 * coding.h (JIS_TO_SJIS): Fix typo (j1->s1, j2->s2).
2194 * charset.c (Fmake_char): Make it more backward compatible.
2195 (Fmap_charset_chars): Fix docstring.
2197 2002-05-13 Dave Love <fx@gnu.org>
2199 * coding.c: Doc fixes.
2200 (Fdefine_coding_system_alias): Use names, not symbols, in
2201 coding-system-alist.
2203 2002-05-13 Kenichi Handa <handa@etl.go.jp>
2205 * fontset.c (free_realized_fontsets): Call Fclear_face_cache instead
2206 of calling free_realized_face.
2208 2002-05-10 Yong Lu <lyongu@asia-infonet.com>
2210 * charset.c (load_charset_map): Fix previous change.
2211 (read_hex): Don't treat SPC as a comment starter.
2212 (decode_char): If CODE_POINT_TO_INDEX retruns -1, always return
2214 (Fdecode_char): Fix typo.
2216 2002-05-10 Kenichi Handa <handa@etl.go.jp>
2218 * charset.h (struct charset): New member `code_space_mask'.
2220 * coding.c (coding_set_source): Delete the local variable
2222 (encode_coding_charset): Delete the local variable charset.
2223 (Fdefine_coding_system_internal): Likewise.
2224 (Fdefine_coding_system_internal): Setup
2225 attrs[coding_attr_charset_valids] correctly.
2227 * charset.c (CODE_POINT_TO_INDEX): Utilize `code_space_mask'
2228 member to check if CODE is valid or not.
2229 (Fdefine_charset_internal): Initialize `code_space_mask' member.
2230 (encode_char): Before calling CODE_POINT_TO_INDEX, check if CODE
2231 is within the range of charset->min_code and carset->max_code.
2233 2002-05-09 Dave Love <fx@gnu.org>
2235 * syntax.h (syntax_temp) [!__GNUC__]: Declare.
2237 * dispextern.h (generate_ascii_font): Fix return type.
2239 * xfaces.c (generate_ascii_font): Fix arg declaration.
2241 * coding.c (coding_inherit_eol_type)
2242 (Fset_terminal_coding_system_internal)
2243 (Fset_safe_terminal_coding_system_internal): Fix arg declarations.
2245 2002-05-08 Kenichi Handa <handa@etl.go.jp>
2247 * coding.c (decode_coding_charset, encode_coding_charset): Handle
2248 multiple charsets correctly.
2250 2002-05-07 Kenichi Handa <handa@etl.go.jp>
2252 * search.c (boyer_moore): Fix handling of mulitbyte character
2255 * xdisp.c (display_mode_element): When the variable `elt' is
2256 changed, update `this' and `lisp_string'.
2258 2002-05-07 Kenichi Handa <handa@etl.go.jp>
2260 * buffer.c (Fset_buffer_multibyte): Fix 8-bit char handling.
2262 * callproc.c (Fcall_process): Be sure to give the current buffer
2263 to decode_coding_c_string. Update PT and PT_BYTE after the
2266 * charset.c (struct charset_map_entries): New struct.
2267 (load_charset_map): Renamed from parse_charset_map. New args
2268 entries and n_entries. Caller changed.
2269 (load_charset_map_from_file): Renamed from load_charset_map.
2270 Caller changed. New arg control_flag. Call load_charset_map at
2272 (load_charset_map_from_vector): New function.
2273 (Fdefine_charset_internal): Setup charset.compact_codes_p.
2274 (encode_char): If the charset is compact, change a character index
2277 * coding.c (coding_alloc_by_making_gap): Check the case that the
2278 source and destination are the same correctly.
2279 (decode_coding_raw_text): Set coding->consumed_char and
2280 coding->consumed to 0.
2281 (produce_chars): If coding->chars_at_source is nonzero, update
2282 coding->consumed_char and coding->consumed before calling
2284 (Fdefine_coding_system_alias): Register ALIAS in
2285 Vcoding_system_alist.
2286 (syms_of_coding): Define `no-convesion' coding system at the tail.
2288 * fileio.c (Finsert_file_contents): Set coding_system instead of
2289 val. If the current buffer is multibyte, always call
2292 * xfaces.c (try_font_list): Give higher priority to fontset's
2293 family than face's family.
2295 2002-04-18 Kenichi Handa <handa@etl.go.jp>
2297 * callproc.c (Fcall_process): Be sure to give the current buffer
2298 to decode_coding_c_string.
2300 * xfaces.c (try_font_list): Give a family specified in a fontset
2301 higher priority than a family specified in a face.
2303 2002-04-09 Kenichi Handa <handa@etl.go.jp>
2305 * fileio.c (Finsert_file_contents): Fix calculation of `inserted'.
2306 Fix arguments to insert_from_buffer.
2308 * xdisp.c (display_mode_element): Fix calculation of `bytepos'.
2310 2002-03-11 Kenichi Handa <handa@etl.go.jp>
2312 * coding.c (produce_chars): Set the variable `multibytep' correctly.
2313 (decode_coding_gap): Set coding->dst_multibyte correctly.
2315 2002-03-07 Kenichi Handa <handa@etl.go.jp>
2317 * coding.c (encode_coding_utf_8): Initialize produced_chars to 0.
2318 (decode_coding_utf_16): Fix converting high and low bytes to
2320 (encode_coding_utf_16): Substitute coding->default_char for
2321 non-Unicode characters.
2322 (decode_coding): Don't call record_insert here.
2323 (setup_coding_system): Initialize `surrogate' of
2324 coding->spec.utf_16 to 0.
2325 (EMIT_ONE_BYTE): Fix for multibyte case.
2327 * insdel.c (insert_from_gap): Call record_insert.
2329 2002-03-04 Kenichi Handa <handa@etl.go.jp>
2331 * casefiddle.c (casify_region): Fix multibyte case.
2333 * character.c (c_string_width): Add return type `int'.
2334 (char_string_with_unification): Arg ADVANCED deleted.
2336 * character.h (CHAR_VALID_P): Don't call CHARACTERP.
2337 (CHAR_STRING): Adjusted for the change of
2338 char_string_with_unification.
2339 (CHAR_STRING_ADVANCE): Make it do-while statement.
2341 * chartab.c (sub_char_table_set_range): Optimized for the case
2342 DEPTH == 3. Add workaround code for a GCC optimization bug.
2344 * charset.c (parse_charset_map): Remove an unused variable.
2346 * coding.c: Delete unused variables.
2348 * fileio.c (Finsert_file_contents): Set coding_system to Qnil
2349 earlier. If inserted is zero and the coding system doesn't
2350 require flushing, don't call decode_coding_gap.
2352 * syntax.h (SET_RAW_SYNTAX_ENTRY): Don't call make_number.
2354 2002-03-01 Kenichi Handa <handa@etl.go.jp>
2356 The following changes are for using Unicode as an internal
2357 character model, and use UTF-8 format for buffer/string
2360 * .gdbinit (xchartable): Adjusted for the change of char table
2362 (xsubchartable, xcoding, xcharset, xcurbuf): New commands.
2364 * Makefile.in (obj): Add character.o and chartab.o.
2365 (lisp, shortlisp): Remove utf-8.elc:
2366 (*.o): For many files, change dependency on charset.h to
2367 character.h, and add dependency on character.h.
2368 (character.o, chartab.o): New targets.
2370 * abbrev.c, bytecode.c, casefiddle.c, cmds.c, dispnew.c, doc.c,
2371 doprnt.c, dosfns.c, frame.c, marker.c, minibuf.c, msdos.c,
2372 w16select.c, w32bdf.c, w32console.c: Include "character.h" instead
2375 * dired.c, filelock.c: Include "character.h".
2377 * alloc.c: Include "character.h" instead of "charset.h".
2378 (Fmake_char_table): Moved to chartab.c.
2379 (make_sub_char_table): Likewise.
2380 (syms_of_alloc): Remove defsubr for Smake_char_table.
2382 * buffer.c: Include "character.h" instead of "charset.h", don't
2384 (Fset_buffer_multibyte): Adjuted for UTF-8.
2386 * buffer.h: EXFUN Fbuffer_live_p.
2388 * callproc.c: Include "character.h" instead of "charset.h".
2389 (Fcall_process): Big change for the new code-conversion APIs.
2391 * casetab.c: Include "character.h" instead of "charset.h".
2392 (set_canon, set_identity, shuffle): Adjusted for the new
2393 map_char_table spec.
2394 (init_casetab_once): Call CHAR_TABLE_SET instead of directly
2395 accessing the char table structure.
2397 * chartab.c: New file that implements char table.
2399 * category.c: Include "character.h".
2400 (copy_category_entry): New function.
2401 (copy_category_table): Call map_char_table and copy_category_entry.
2402 (Fmake_category_table): Initialize all top-vel slots.
2403 (char_category_set): New function.
2404 (modify_lower_category_set): Deleted.
2405 (Fmodify_category_entry): Call char_table_ref_and_range.
2407 * category.h (CATEGORY_SET): Just call char_category_set.
2409 * ccl.c: Include "character.h".
2410 (Qccl, Qcclp): New variables.
2411 (CCL_WRITE_CHAR): Alway treat the arg CH as a character even if
2413 (CCL_WRITE_MULTIBYTE_CHAR): Deleted.
2414 (CCL_WRITE_STRING, CCL_READ_CHAR): Adjusted for the change of SRC
2416 (ccl_driver): Types of arguments changed. Code adjusted for that.
2417 (Fccl_execute, Fccl_execute_on_string): Adjusted for the change of
2419 (syms_of_ccl): Intern and staticpro Qccl and Qcclp.
2421 * ccl.h (struct ccl_program): Members eol_type and multibyte
2422 deleted. New members src_multibyte, dst_multibyte, consumed, and
2424 (struct ccl_spec): Members decoder and encoder deleted. New
2426 (CODING_SPEC_CCL_PROGRAM): New macro.
2427 (ccl_driver): Prototype updated.
2428 (Qccl, Qcclp, Fccl_program_p): Extern them.
2429 (CHECK_CCL_PROGRAM): New macro.
2431 * character.c, character.h, chartab.c: New files.
2433 * charset.c: Mostly re-written. Character and multibyte sequence
2434 handling codes are moved to character.c.
2436 * charset.h: Mostly re-written. Character and multibyte sequence
2437 handling codes are moved to character.h.
2439 * coding.c, coding.h: Mostly re-written.
2441 * composite.c: Include "character.h" instead of "charset.h".
2442 (CHAR_WIDTH): Moved to character.h.
2443 (HASH_KEY, HASH_VALUE): Deleted.
2445 * composite.h (enum composition_method): Order of enumeration
2448 * data.c: Include "character.h" instead of "charset.h".
2449 (Faref): Call CHAR_TABLE_REF for a char table.
2450 (Faset): Call CHAR_TABLE_SET for a char table.
2452 * dispextern.h (free_realized_face, check_face_attribytes,
2453 generate_ascii_font): Extern them.
2454 (free_realized_multibyte_face): Extern deleted.
2456 * disptab.h (DISP_CHAR_VECTOR): Adjusted for the change of char
2459 * editfns.c: Include "character.h" instead of "charset.h".
2460 (Fchar_to_string): Always call CHAR_STRING.
2462 * emacs.c (main): Call init_charset_once, init_charset,
2463 syms_of_chartab, and syms_of_character.
2465 * fileio.c: Include "character.h" instead of "charset.h".
2466 (Finsert_file_contents): Big change for the new code-conversion
2468 (choose_write_coding_system): Likewise.
2469 (Fwrite_region): Likewise.
2470 (build_annotations_2): Deleted.
2471 (e_write): Big change for the new code-conversion API.
2473 * fns.c: Include "character.h" instead of "charset.h".
2474 (copy_sub_char_table): Moved to chartab.c.
2475 (Fcopy_sequence): Call copy_char_table for a char table.
2476 (concat): Delete codes calling count_multibyte.
2477 (string_char_to_byte): Adjusted for the new multibyte form.
2478 (string_byte_to_char): Likewise.
2479 (internal_equal): Adjusted for the change of char table structure.
2480 (Fchar_table_subtype, Fchar_table_parent, Fset_char_table_parent,
2481 Fchar_table_extra_slot, Fset_char_table_extra_slot,
2482 Fchar_table_range, Fset_char_table_range, Fset_char_table_default,
2483 char_table_translate, optimize_sub_char_table,
2484 Foptimize_char_table, map_char_table, Fmap_char_table): Moved to
2486 (char_table_ref_and_index): Deleted.
2487 (HASH_KEY, HASH_VALUE): Moved to lisp.h.
2488 (Fmd5): Call preferred_coding_system instead of accessing
2489 Vcoding_category_list. Adjusted for the new code-conversion API.
2490 (syms_of_fns): Defsubr for char table related functions moved to
2493 * fontset.c: Mostly re-written.
2495 * fontset.h (struct font_info): Type of the member encoding_type
2497 (enum FONT_SPEC_INDEX): New enum.
2498 (fontset_font_pattern, fs_load_font): Prototype updated.
2499 (FS_LOAD_FONT): Adjusted for the change of fs_load_font.
2501 * indent.c: Include "character.h" instead of "charset.h".
2502 (MULTIBYTE_BYTES_WIDTH): Call CHAR_WIDTH instead of
2505 * insdel.c: Include "character.h" instead of "charset.h".
2506 (copy_text): Don't refer to Vnonascii_translation_table.
2507 (insert_from_gap): New function.
2509 * keyboard.c: Include "character.h" instead of "charset.h".
2510 (command_loop_1): Never call direct_output_forward_char before
2511 a non-ASCII character.
2512 (read_char): If Vkeyboard_translate_table is a char table, always
2513 translated a character.
2515 * keymap.c: Include "character.h".
2516 (store_in_keymap): Handle the case that IDX is a cons.
2517 (Fdefine_key): Handle the case that KEY is a cons and the car part
2518 is also a cons (range).
2519 (push_key_description): Adjusted for the new character code.
2520 (describe_vector): Call describe_char_table for a char table.
2521 (describe_char_table): New function.
2523 * keymap.h (describe_char_table): Extern it.
2525 * lisp.h (enum pvec_type): New member PVEC_SUB_CHAR_TABLE.
2526 (XSUB_CHAR_TABLE, XSETSUB_CHAR_TABLE): New macros.
2527 (CHAR_TABLE_ORDINARY_SLOTS, CHAR_TABLE_SINGLE_BYTE_SLOTS,
2528 SUB_CHAR_TABLE_ORDINARY_SLOTS, SUB_CHAR_TABLE_STANDARD_SLOTS):
2530 (CHAR_TABLE_REF, CHAR_TABLE_SET): Adjusted for the new char table
2532 (CHAR_TABLE_TRANSLATE): Just call char_table_translate.
2533 (CHARTAB_SIZE_BITS_0, CHARTAB_SIZE_BITS_1, CHARTAB_SIZE_BITS_2,
2534 CHARTAB_SIZE_BITS_3): New macros.
2535 (chartab_size): Extern it.
2536 (struct Lisp_Char_Table): Re-designed.
2537 (struct Lisp_Sub_Char_Table): New structure.
2538 (HASH_KEY, HASH_VALUE): Moved from fns.c.
2539 (CHARACTERBITS): Defined as 22.
2540 (GLYPH_MASK_FACE, GLYPH_MASK_CHAR): Adjusted for the above change.
2541 (SUB_CHAR_TABLE_P): Check PVEC_CHAR_TABLE.
2542 (GC_SUB_CHAR_TABLE_P): New macro.
2543 (Fencode_coding_string, Fdecode_coding_string): EXFUN Updated.
2544 (code_convert_string_norecord): Extern deleted.
2545 (init_character_once, syms_of_character, init_charset,
2546 syms_of_composite, Qeq, Fmakehash, insert_from_gap): Extern them.
2548 * lread.c: Include "character.h".
2549 (read_multibyte): New arg NBYTES.
2550 (read_escape): The meaning of returned *BYTEREP changed.
2551 (to_multibyte): Deleted.
2552 (read1): Adjuted the handling of char table and string.
2554 * print.c: Include "character.h" instead of "charset.h".
2555 (print_string): Convert 8-bit raw bytes to octal form by
2556 string_escape_byte8.
2557 (print_object): Adjusted for the new multibyte form. Print 8-bit
2558 raw bytes always in octal form. Handle sub char table correctly.
2560 * process.c: Include "character.h" instead of "charset.h".
2561 (read_process_output): Adjusted for the new code-conversion API.
2562 (send_process): Likewise.
2564 * puresize.h (BASE_PURESIZE): Increased.
2566 * regex.c: Include "character.h" instead of "charset.h".
2567 (BYTE8_TO_CHAR, CHAR_BYTE8_P) [not emacs]: New dummy macros.
2568 (regex_compile): Accept a range whose starting and ending
2569 character have different leading bytes.
2570 (analyse_first): Adjusted for the above change.
2572 * search.c: Include "character.h" instead of "charset.h".
2573 (search_buffer, boyer_moore): Adjusted for the new multibyte form.
2574 (Freplace_match): Adjusted for the change of
2575 multibyte_char_to_unibyte.
2577 * syntax.c: Include "character.h" instead of "charset.h".
2578 (syntax_parent_lookup): Deleted.
2579 (Fmodify_syntax_entry): Accept a cons as CHAR.
2580 (skip_chars): Adjusted for the new multibyte form.
2581 (init_syntax_once): Call char_table_set_range instead of directly
2582 accessing the structure of a char table.
2584 * syntax.h (SET_RAW_SYNTAX_ENTRY): Call CHAR_TABLE_SET.
2585 (SYNTAX_ENTRY_FOLLOW_PARENT): Macro deleted.
2586 (SET_RAW_SYNTAX_ENTRY_RANGE): New macro.
2587 (SYNTAX_ENTRY_INT): Call CHAR_TABLE_REF.
2589 * term.c: Include "buffer.h" and "character.h".
2590 (encode_terminal_code): Adjusted for the new code-conversion API.
2591 (write_glyphs): Likewise.
2592 (produce_glyphs): Call CHAR_WIDTH instead of CHARSET_WIDTH.
2594 * w32term.c (x_new_font): Adjusted for the change of FS_LOAD_FONT.
2596 * xdisp.c: Include "character.h".
2597 (get_next_display_element): Adjusted for the new multibyte form.
2598 (disp_char_vector): Adjusted for the new char table structure.
2599 (decode_mode_spec_coding): Adjusted for the new structure of
2601 (decode_mode_spec): Adjusted for the new code-conversion API.
2603 * xfaces.c: Include "character.h" instead of "charset.h".
2604 (load_face_font): Adjusted for the change of choose_face_font and
2606 (generate_ascii_font): New function.
2607 (set_lface_from_font_name): Adjusted for the change of
2609 (set_font_frame_param): Adjusted for the change of
2611 (free_realized_face): Make it public.
2612 (free_realized_faces_for_fontset): Renamed from
2613 free_realized_multibyte_face. Free also faces realized for ASCII.
2614 (choose_face_font): Argments changed. Adjusted for the change of
2615 fontset_font_pattern and FS_LOAD_FONT.
2617 * xfns.c: Include "character.h".
2618 (x_encode_text): Adjusted for the new code-conversion API.
2620 * xselect.c: Don't include "charset.h".
2621 (selection_data_to_lisp_data): Adjusted for the new code
2624 * xterm.c: Include "character.h".
2625 (x_encode_char): New argument CHARSET. Caller changed.
2626 (x_get_char_face_and_encoding): Call ENCODE_CHAR instead of
2628 (x_get_glyph_face_and_encoding): Likewise.
2629 (x_produce_glyphs): Don't check Vnonascii_translation_table Call
2630 CHAR_WIDTH instead of CHARSET_WIDTH.
2631 (XTread_socket): Adjusted for the new code-conversion API.
2632 (x_new_font): Adjusted for the change of FS_LOAD_FONT.
2633 (x_load_font): Adjusted for the change of struct font.
2636 ;; coding: iso-2022-7bit
2639 Copyright (C) 2002 Free Software Foundation, Inc.
2640 Copying and distribution of this file, with or without modification,
2641 are permitted provided the copyright notice and this notice are preserved.