1 2003-01-07 Kenichi Handa <handa@etl.go.jp>
3 * xterm.c (x_new_font): Optimize for the case that the font is
4 already set for the frame.
6 2003-01-06 Kenichi Handa <handa@m17n.org>
8 * chartab.c (char_table_ascii): Check if the char table contents
9 is sub-char-table or not.
10 (char_table_set): Fix argument to char_table_ascii.
11 (char_table_set_range): Likewise.
13 * coding.c (CATEGORY_MASK_RAW_TEXT): New macro.
14 (detect_coding_utf_8, detect_coding_utf_16)
15 (detect_coding_emacs_mule, detect_coding_iso_2022)
16 (detect_coding_sjis, detect_coding_big5)
17 (detect_coding_ccl, detect_coding_charset): Change argument MASK
18 to DETECT_INFO. Update DETECT_INFO and return 1 if the byte
19 sequence is valid in this coding system. Callers changed.
20 (MAX_ANNOTATION_LENGTH): New macro.
21 (ADD_ANNOTATION_DATA): New macro.
22 (ADD_COMPOSITION_DATA): Argument changed. Callers changed. Call
23 ADD_ANNOTATION_DATA. The format of annotation data changed.
24 (ADD_CHARSET_DATA): New macro.
25 (emacs_mule_char): New argument ID. Callers changed.
26 (decode_coding_emacs_mule, decode_coding_iso_2022)
27 (decode_coding_sjis, decode_coding_big5, decode_coding_charset):
28 Produce charset annotation data in coding->charbuf.
29 (encode_coding_emacs_mule, encode_coding_iso_2022): Pay attention
30 to charset annotation data in coding->charbuf.
31 (setup_coding_system): Add CODING_ANNOTATE_CHARSET_MASK
32 coding->common_flags if the coding system is iso-2022 based and
34 (produce_composition): Adjusted for the new annotation data
36 (produce_charset): New function.
37 (produce_annotation): Handle charset annotation.
38 (handle_composition_annotation, handle_charset_annotation): New
40 (consume_chars): Handle charset annotation. Utilize the above two
42 (encode_coding_object): If SRC_OBJECT and DST_OBJECT are the same
43 buffer, get the deleted text as a string and set
44 coding->src_object to that string.
45 (detect_coding, detect_coding_system): Use the new struct
46 coding_detection_info.
48 * coding.h (struct coding_detection_info): New structure.
49 (struct coding_system): Prototype of the member `detector'
51 (CODING_ANNOTATE_CHARSET_MASK): New macro.
53 2003-01-06 Kenichi Handa <handa@etl.go.jp>
55 * insdel.c (insert_from_gap): Fix argument to offset_intervals.
57 2003-01-03 Dave Love <fx@gnu.org>
59 * keymap.c (apropos_predicate, apropos_accumulate): Declare
61 (Fapropos_internal): Don't gcpro apropos_accumulate. Set result
62 to new local and nullify apropos_accumulate before returning.
63 (syms_of_keymap): Staticpro and initialize apropos_accumulate.
65 2002-12-05 Kenichi Handa <handa@m17n.org>
67 * charset.c (Fdefine_charset_internal): Setup charset.fast_map
70 2002-11-26 Dave Love <fx@gnu.org>
72 * fns.c (Flanginfo): Call synchronize_system_time_locale.
74 2002-11-07 Kenichi Handa <handa@m17n.org>
76 The following changes are to make character composition happen
77 automatically on displaying.
79 * Makefile.in (lisp, shortlisp): Add composite.elc
81 * composite.h (Qauto_composed, Vauto_composition_function,
82 Qauto_composition_function): Extern them.
84 * composite.c (Vcomposition_function_table,
85 Qcomposition_function_table): Delete variables.
86 (Qauto_composed, Vauto_composition_function,
87 Qauto_composition_function): New variables.
88 (run_composition_function): Don't call
89 compose-chars-after-function.
90 (update_compositions): Clear `auto-composed' text property.
91 (compose_chars_in_text): Delete this function.
92 (syms_of_composite): Staticpro Qauto_composed and
93 Qauto_composition_function. Declare Vauto_composition_function as
96 * dispextern.h (enum prop_idx): Add member AUTO_COMPOSED_PROP_IDX.
98 * xdisp.c (it_props): Add an entry for Qauto_composed.
99 (handle_auto_composed_prop): New function.
101 * xselect.c (selection_data_to_lisp_data): Don't call
102 compose_chars_in_text.
104 2002-11-06 Dave Love <fx@gnu.org>
106 * keyboard.c (read_char): Modify checking around use of
107 Vkeyboard_translate_table.
109 * xterm.c (XTread_socket): Check Lisp types for Vx_keysym_table
112 2002-11-06 Kenichi Handa <handa@m17n.org>
114 * coding.c (decode_coding_utf_8): When eol_type is Qdos, handle
115 the case that the last byte is '\r' correctly.
116 (decode_coding_emacs_mule): Likewise.
117 (decode_coding_iso_2022): Likewise.
118 (decode_coding_sjis): Likewise.
119 (decode_coding_big5): Likewise.
120 (decode_coding_charset): Likewise.
121 (produce_chars): Likewise.
122 (decode_coding): Flushing out the unprocessed data correctly.
123 (decode_coding_gap): Set CODING_MODE_LAST_BLOCK bit of
126 2002-10-31 Dave Love <fx@gnu.org>
128 * xterm.c (XTread_socket): Fix changes for defined keysyms. Add
130 (xaw_scroll_callback): Revert last change.
132 2002-10-30 Kenichi Handa <handa@m17n.org>
134 * charset.c (Fset_charset_priority): Update
135 Viso_2022_charset_list.
137 2002-10-29 Kenichi Handa <handa@m17n.org>
139 * xfaces.c (Vface_resizing_fonts): New variable.
140 (struct font_name): New member `resizing_ratio'.
141 (font_resizing_ratio): New function.
142 (split_font_name): Set font->resizing_ratio.
143 (better_font_p): Pay attention to font->resizing_ratio.
144 (build_scalable_font_name): Likewise. Don't change POINT_SIZE,
145 RESX, and RESY fields.
146 (try_alternative_families): Try scalable fonts if
147 Vscalable_fonts_allowed is not Qt.
148 (syms_of_xfaces): Declare Vface_resizing_fonts as a Lisp variable.
150 2002-10-29 Dave Love <fx@gnu.org>
152 * xterm.c (xaw_scroll_callback): Cast correctly.
154 2002-10-28 Dave Love <fx@gnu.org>
156 * keyboard.c (lispy_accent_codes, lispy_accent_keys): Extend.
157 (lispy_kana_keys): Comment out.
158 (make_lispy_event) [XK_kana_A]: Comment out.
160 * xterm.c (xaw_scroll_callback): Cast call_data.
161 (XTread_socket): Deal with ASCII keysyms.
162 (syms_of_xterm) <Vx_keysym_table>: Fix args of make_hash_table.
164 2002-10-27 Dave Love <fx@gnu.org>
166 * xterm.c (Vx_keysym_table): New.
167 (syms_of_xterm): Initialize it.
168 (XTread_socket): Use it.
169 From head: Eliminate incorrect optimization that tried to avoid
170 decoding the output of X*LookupString.
171 (x_get_font_repertory): Delete charset declaration.
173 2002-10-16 Kenichi Handa <handa@m17n.org>
175 * coding.c (detect_coding): Fix previous change.
176 (detect_coding_charset): If only ASCII bytes are found, return 0.
177 (detect_coding_system): Fix previous change.
178 (Fdefine_coding_system_internal): Setup CODING_ATTR_ASCII_COMPAT
181 2002-10-15 Dave Love <fx@gnu.org>
183 * coding.c (Fcheck_coding_system): Doc fix.
185 * editfns.c (Finsert_byte): Return a proper value.
187 2002-10-14 Kenichi Handa <handa@etl.go.jp>
189 * coding.c (decode_coding): Fix args to translate_chars. Pay
190 attention to Vstandard_translation_table_for_decode.
191 (encode_coding): Fix args to translate_chars. Pay attention to
192 Vstandard_translation_table_for_encode.
194 * data.c (Faset): Check NEWELT by ASCII_CHAR_P, not by
197 * editfns.c (general_insert_function): Check VAL by ASCII_CHAR_P,
198 not by SINGLE_BYTE_CHAR_P.
200 * fns.c (concat): Check CH by ASCII_CHAR_P, not by
203 * insdel.c (copy_text): Check C by ASCII_CHAR_P, not by
206 * keymap.c (Ftext_char_description): Check C by ASCII_CHAR_P, not
207 by SINGLE_BYTE_CHAR_P.
209 * search.c (Freplace_match): Check C by ASCII_CHAR_P, not by
212 2002-10-14 Dave Love <fx@gnu.org>
214 * fns.c (Fstring_as_multibyte, Fstring_to_multibyte): Doc fix.
216 2002-10-10 Dave Love <fx@gnu.org>
218 * fns.c (Flanginfo): Fix typo.
220 * unexelf.c (unexec): Make last change conditional on Irix 6.5.
222 2002-10-10 Kenichi Handa <handa@m17n.org>
224 * coding.c (detect_coding_utf_8): Check incomplete byte sequence.
225 Don't update *mask when correctly detected.
226 (detect_coding_utf_16): Likewise.
227 (detect_coding_emacs_mule): Likewise.
228 (detect_coding_iso_2022): Likewise.
229 (detect_coding_sjis): Likewise.
230 (detect_coding_big5): Likewise.
231 (detect_coding_ccl): Likewise.
232 (decode_coding_sjis): Fix decoding of katakana-jisx0201.
233 (detect_eol): Delete the argument CODING, and add the argument
235 (detect_coding): Adjusted for the changes above.
236 (detect_coding_system): Likewise.
238 2002-10-09 Kenichi Handa <handa@m17n.org>
240 * character.c (char_string): Renamed from
241 char_string_with_unification. Pay attention to
243 (string_char): Renamed from string_char.
245 * character.h (CHAR_STRING): Call char_string if C is greater than
247 (CHAR_STRING_ADVANCE): Likewise.
248 (STRING_CHAR): Call string_char instead of
249 string_char_with_unification.
250 (STRING_CHAR_AND_LENGTH): Likewise.
251 (STRING_CHAR_ADVANCE): Likewise.
253 2002-10-09 Dave Love <fx@gnu.org>
255 * coding.c (decode_coding_utf_8): Treat surrogates as invalid.
257 2002-10-07 Kenichi Handa <handa@m17n.org>
259 * keymap.c (push_key_description): Pay attention to
262 * regex.c (re_search_2): Fix for the case of unibyte buffer.
264 2002-10-06 Dave Love <fx@gnu.org>
266 * charset.c (define_charset_internal): Rename `supprementary'.
268 * Makefile.in (lisp, shortlisp): Remove latin-N.
270 2002-10-05 Dave Love <fx@gnu.org>
272 * xfns.c (x_window, x_window): Use use_xim.
274 * xterm.c (use_xim): Initialize.
275 (xim_open_dpy, xim_initialize, xim_close_dpy): Use use_xim.
276 (x_term_init): Maybe set use_xim.
278 * xterm.h (use_xim) [HAVE_X_I18N]: Declare.
280 2002-10-01 Kenichi Handa <handa@m17n.org>
282 * search.c (search_buffer): Fix case-fold-search of multibyte
284 (boyer_moore): Rename the last argument to char_high_bits.
286 2002-09-27 Kenichi Handa <handa@etl.go.jp>
288 * xdisp.c (display_string): Fix for the case of zero width glyph.
290 * xfns.c (x_set_font): Change the error message of the case that
291 x_new_fontset returns Qt.
293 * xfaces.c (set_lface_from_font_name): Reject the default fontset.
294 (Finternal_set_lisp_face_attribute): Use signal_error for the
295 error of invalid fontset.
297 * xterm.c (x_new_fontset): If FONTSETNAME specifies the default
300 2002-09-19 Kenichi Handa <handa@etl.go.jp>
302 * regex.c (re_search_2): Fix previous change.
304 2002-09-18 Kenichi Handa <handa@etl.go.jp>
306 * syntax.c (skip_syntaxes): Fix previous change.
308 2002-09-13 Kenichi Handa <handa@etl.go.jp>
310 * syntax.c (skip_chars): Fix previous change.
311 (skip_syntaxes): Fix previous change.
313 2002-09-06 Dave Love <fx@gnu.org>
315 * config.in: Restore it.
317 2002-09-05 Dave Love <fx@gnu.org>
319 * config.in: Removed (now auto-generated).
321 * s/usg5-4.h: Fix last change.
323 * unexelf.c (unexec): Make .got handling not SGI-specific.
325 * syntax.c (syms_of_syntax) <multibyte-syntax-as-symbol>: Doc fix.
327 * regex.c: Use `ifdef HAVE_ALLOCA_H', not `if HAVE_ALLOCA_H'.
329 * keyboard.c (read_key_sequence): Fix type error.
331 * buffer.c (Fset_buffer_multibyte, Fset_buffer_multibyte): Fix
334 * fontset.c (fontset_add): Return Lisp_Object.
336 2002-09-03 Dave Love <fx@gnu.org>
338 * charset.h (charset_ordered_list_tick): Declare extern.
340 2002-09-03 Kenichi Handa <handa@etl.go.jp>
342 The following changes (and some of 2002-08-20 changes of mine) are
343 for handling syntax, category, and case conversion for unibyte
344 characters by converting them to multibyte on the fly. With these
345 changes, we don't have to setup syntax and case tables for unibyte
346 characters in each language environment.
348 * abbrev.c (Fexpand_abbrev): Convert a unibyte character to
349 multibyte if necessary.
351 * bytecode.c (Fbyte_code): Likewise.
353 * character.h (LEADING_CODE_LATIN_1_MIN)
354 (LEADING_CODE_LATIN_1_MAX): New macros.
355 (unibyte_to_multibyte_table): Extern it.
356 (unibyte_char_to_multibyte): New macro.
357 (MAKE_CHAR_MULTIBYTE): Use unibyte_to_multibyte_table.
358 (CHAR_LEADING_CODE): New macro.
359 (FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE): New macro.
361 * character.c (unibyte_to_multibyte_table): New variable.
362 (unibyte_char_to_multibyte): Move to character.h and defined as
364 (multibyte_char_to_unibyte): If C is an eight-bit character,
365 convert it to the corresponding byte value.
367 * charset.c (Fset_unibyte_charset): If the dimension of CHARSET is
368 not 1, singals an error. Update the elements of
369 unibyte_to_multibyte_table.
370 (init_charset_once): Initialize unibyte_to_multibyte_table.
371 (syms_of_charset): Define the charset `iso-8859-1'.
373 * casefiddle.c (casify_object): Fix previous change.
375 * cmds.c (internal_self_insert): In a multibyte buffer, insert C
376 as is without converting it to unibyte. In a unibyte buffer,
377 convert C to multibyte before checking the syntax.
379 * lisp.h (unibyte_char_to_multibyte): Extern deleted.
381 * minibuf.c (Fminibuffer_complete_word): Use the macro
382 FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE.
384 * regex.h (struct re_pattern_buffer): New member target_multibyte.
386 * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
387 (GET_CHAR_BEFORE_2): Check target_multibyte, not multibyte. If
388 that is zero, convert an eight-bit char to multibyte.
389 (MAKE_CHAR_MULTIBYTE, CHAR_LEADING_CODE): New dummy new macros for
391 (PATFETCH): Convert an eight-bit char to multibyte.
392 (HANDLE_UNIBYTE_RANGE): New macro.
393 (regex_compile): Setup the compiled pattern for multibyte chars
394 even if the given regex string is unibyte. Use PATFETCH_RAW
395 instead of PATFETCH in many places. To handle `charset'
396 specification of unibyte, call HANDLE_UNIBYTE_RANGE. Use bitmap
397 only for ASCII chars.
398 (analyse_first) <exactn>: Simplified because the compiled pattern
400 <charset_not>: Setup fastmap from bitmap only for ASCII chars.
401 <charset>: Use CHAR_LEADING_CODE to get leading codes.
402 <categoryspec>: If multibyte, setup fastmap only for ASCII chars
404 (re_compile_fastmap) [emacs]: Call analyse_first with the arg
406 (re_search_2) In emacs, set the locale variable multibyte to 1,
407 otherwise to 0. New local variable target_multibyte. Check it
408 to decide the multibyteness of STR1 and STR2. If
409 target_multibyte is zero, convert unibyte chars to multibyte
410 before translating and checking fastmap.
411 (TARGET_CHAR_AND_LENGTH): New macro.
412 (re_match_2_internal): In emacs, set the locale variable multibyte
413 to 1, otherwise to 0. New local variable target_multibyte. Check
414 it to decide the multibyteness of STR1 and STR2. Use
415 TARGET_CHAR_AND_LENGTH to fetch a character from D.
416 <charset, charset_not>: If multibyte is nonzero, check fastmap
417 only for ASCII chars. Call bcmp_translate with
418 target_multibyte, not with multibyte.
419 <begline>: Declare the local variable C as `unsigned'.
420 (bcmp_translate): Change the last arg name to target_multibyte.
422 * search.c (compile_pattern_1): Don't adjust the multibyteness of
423 the regexp pattern and the matching target. Set cp->buf.multibyte
424 to the multibyteness of the regexp pattern. Set
425 cp->but.target_multibyte to the multibyteness of the matching
427 (wordify): Use FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE instead of
428 FETCH_STRING_CHAR_ADVANCE.
429 (Freplace_match): Convert unibyte chars to multibyte.
431 * syntax.c (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
432 unibyte chars to multibyte.
433 (back_comment): Likewise.
434 (scan_words): Likewise.
435 (skip_chars): The arg syntaxp is deleted, and the code for
436 handling syntaxes is moved to skip_syntaxes. Callers changed.
437 Fix the case that the multibyteness of STRING and the current
438 buffer doesn't match.
439 (skip_syntaxes): New function.
440 (SYNTAX_WITH_MULTIBYTE_CHECK): Check C by ASCII_CHAR_P, not by
442 (Fforward_comment): Use FETCH_CHAR_AS_MULTIBYTE to convert unibyte
444 (scan_lists): Likewise.
445 (Fbackward_prefix_chars): Likewise.
446 (scan_sexps_forward): Likewise.
448 2002-08-23 Kenichi Handa <handa@etl.go.jp>
450 * xfaces.c (QCfontset): New variable.
451 (LFACE_FONTSET): New macro.
452 (check_lface_attrs): Check also LFACE_FONTSET_INDEX.
453 (set_lface_from_font_name): Setup LFACE_FONTSET (lface).
454 (Finternal_set_lisp_face_attribute): Handle QCfontset.
455 (Finternal_get_lisp_face_attribute): Likewise.
456 (lface_same_font_attributes_p): Fix checking of LFACE_FONT_INDEX,
457 check also LFACE_FONTSET_INDEX.
458 (face_fontset): Check attrs[LFACE_FONTSET_INDEX], not
459 attrs[LFACE_FONT_INDEX].
460 (syms_of_xfaces): Intern and staticpro QCfontset.
462 * dispextern.h (enum lface_attribute_index): New member
465 * fns.c (base64_encode_1): Handle eight-bit chars correctly.
467 2002-08-21 Kenichi Handa <handa@etl.go.jp>
469 * coding.c (coding_set_destination): Fix coding->destination for
470 the case converting a region.
471 (encode_coding_utf_8): Encode eight-bit chars as single byte.
472 (encode_coding_object): Fix coding->dst_pos and
473 coding->dst_pos_byte for the case converting a region.
475 * insdel.c (insert_from_gap): Make it work even if PT != GTP.
477 * character.h (BYTE8_STRING): New macro.
479 * fns.c (base64_decode_1): Insert eight-bit chars correctly.
481 2002-08-20 Kenichi Handa <handa@etl.go.jp>
483 * xdisp.c (get_next_display_element): Don't display unibyte 8-bit
484 characters by octal form.
486 * abbrev.c (Fexpand_abbrev): Fix for the multibyte case.
488 * buffer.h (_fetch_multibyte_char_len): Extern deleted.
489 (FETCH_MULTIBYTE_CHAR): Don't use _fetch_multibyte_char_len.
490 (BUF_FETCH_MULTIBYTE_CHAR): Likewise.
491 (FETCH_CHAR_AS_MULTIBYTE): New macro.
493 * casetab.c (set_canon, set_identity, shuffle): Simplified.
495 * casefiddle.c (casify_object): Simplified. Handle the case that
496 the case conversion change the byte length.
497 (casify_region): Likewise
499 * character.h (MAKE_CHAR_UNIBYTE, MAKE_CHAR_MULTIBYTE): New
502 * character.c (_fetch_multibyte_char_len): This variable deleted.
503 (syms_of_character): Setup Vprintable_chars.
505 * editfns.c (Fchar_equal): Fix for the unibyte case.
506 (Finsert_byte): New function.
507 (syms_of_editfns): Defsubr it.
509 * keyboard.c (read_key_sequence): Use ~CHAR_MODIFIER_MASK instead
510 of direct code 0x3ffff.
512 * search.c (Freplace_match): Fix for the unibyte case.
514 2002-08-19 Kenichi Handa <handa@etl.go.jp>
516 * lread.c (safe_to_load_p): Fix the logic.
518 * syntax.c (scan_words): Don't treat characters belonging to
519 different scripts as constituting a word.
521 * editfns.c (Fformat): Use ASCII_CHAR_P, not SINGLE_BYTE_CHAR_P.
523 * fontset.c (Fset_fontset_font): Treat `ascii' as charset, not
526 * emacs.c (main): In the case of --unibyte, instead of aborting on
527 finding non-empty buffer, make it unibyte.
529 2002-08-18 Kenichi Handa <handa@etl.go.jp>
531 * xterm.c (x_new_fontset): Call `create-fontset-from-ascii-font'
534 2002-08-18 Dave Love <fx@gnu.org>
536 * character.c (Funibyte_char_to_multibyte): Doc fix.
538 * xfns.c [HAVE_STDLIB_H]: Fix last change.
540 2002-08-15 Kenichi Handa <handa@etl.go.jp>
542 * fontset.c (fontset_add): Make the type `int'.
543 (fontset_id_valid_p): Define it if FONTSET_DEBUG is defined.
545 * character.c (unibyte_char_to_multibyte): Refer to
546 charset_unibyte, not charset_primary.
547 (multibyte_char_to_unibyte): Likewise.
548 (Funibyte_char_to_multibyte): Likewise.
550 * charset.h: (charset_unibyte): Extern it instead of
553 * charset.c (charset_unibyte): Renamed from charset_primary.
554 (Funibyte_charset): Renamed from Fprimary_charset.
555 (Fset_unibyte_charset): Renamed from Fset_primary_charset.
556 (syms_of_charset): Adjusted for the above changes.
558 * w32term.c (x_produce_glyphs): Use ASCII_CHAR_P, not
559 SINGLE_BYTE_CHAR_P. Fix the logic of handling non-ASCII char when
560 it->multibyte_p is zero.
562 * lisp.h (nonascii_insert_offset, Vnonascii_translation_table):
565 2002-08-08 Kenichi Handa <handa@etl.go.jp>
567 * coding.c (Fdefine_coding_system_internal): Fix category setting
568 for a coding system of type iso-2022.
570 2002-08-02 Kenichi Handa <handa@etl.go.jp>
572 * fontset.h (FS_LOAD_FONT): Call fs_load_font with the arg CHARSET
575 2002-08-01 Kenichi Handa <handa@etl.go.jp>
577 * syntax.c (Vnext_word_boundary_function_table): New variable.
578 (syms_of_syntax): Declare it as a Lisp variable.
579 (scan_words): Call functions in Vnext_word_boundary_function_table
582 * xterm.c (x_load_font): Initialize fontp->fontset to -1.
584 * fontset.c (fs_load_font): If fontp->charset is not negative,
585 return fontp without setting its members.
587 2002-07-31 Dave Love <fx@gnu.org>
589 * config.in: Generated with autoheader.
591 * xfns.c [HAVE_STDLIB_H]: Change logic (instead of fixing typo).
593 * m/sparc.h (HAVE_ALLOCA): Delete.
595 * s/irix6-5.h: Don't include strings.h.
596 (bcopy, bzero, bcmp): Don't undef.
598 * s/irix6-0.h (bcopy, bzero, bcmp): Don't undef.
600 * s/usg5-4.h (NO_SIOCTL_H): Don't define.
601 (TIOCSIGSEND): Don't test IRIX6.
602 (bcopy, bzero, bcmp): Define conditionally.
604 2002-07-31 Kenichi Handa <handa@etl.go.jp>
606 * buffer.c (Qas, Qmake, Qto): New variables.
607 (Fset_buffer_multibyte): New optional arg METHOD. Caller changed.
608 (syms_of_buffer): Intern and staticpro Qas, Qmake, and Qto.
610 * callproc.c (Fcall_process): Don't call insert_1_both directly if
611 we are inserting a process output into a multibyte buffer.
613 * character.h (CHAR_TO_BYTE8): If C is not eight-bit char, call
614 multibyte_char_to_unibyte.
616 * character.c (Funibyte_char_to_multibyte): If C can't be decoded
617 by the primary charset, make it eight-bit char.
618 (Fmultibyte_char_to_unibyte): Call CHAR_TO_BYTE8.
620 * charset.c: (charset_eight_bit, Qeight_bit_control): New
622 (charset_8_bit__control, charset_8_bit_graphic,
623 Qeight_bit_control, Qeight_bit_graphic): These variables deleted.
624 (define_charset_internal): New function.
625 (syms_of_charset): Call define_charset_internal for pre-defined
628 * charset.h (charset_8_bit): Extern it.
630 * coding.c (make_conversion_work_buffer): Adjusted for the change
631 of Fset_buffer_multibyte.
632 (encode_coding_raw_text): Increment p0 in the loop.
634 * lisp.h (Fset_buffer_multibyte): Prototype adjusted.
636 * xdisp.c (setup_echo_area_for_printing, set_message_1): Adjusted
637 for the change of Fset_buffer_multibyte.
639 * fns.c (Fstring_to_multibyte): New function.
640 (syms_of_fns): Declare Fstring_to_multibyte as Lisp subroutine.
642 2002-07-30 Dave Love <fx@gnu.org>
644 * xfns.c (x_put_x_image): Declare args.
646 * xfaces.c (font_name_registry, choose_face_font): Delete unused
648 (try_font_list): Declare an arg.
650 * xdisp.c (message2_nolog, set_message): Declare an arg.
652 * terminfo.c (tparam): Declare an arg. Use P_ to declare tparm.
654 * syntax.c (scan_sexps_forward): Declare an arg.
656 * scroll.c (calculate_scrolling, calculate_direct_scrolling):
659 * lisp.h (Fnew_fontset): Declare.
661 * keymap.c (push_key_description): Call CHARACTERP correctly.
663 * fontset.c (fontset_add): Declare args. Call make_number
665 (face_for_char): Delete unused vars.
666 (Fset_fontset_font): Doc fix. Delete unused vars.
668 * doc.c (Fsubstitute_command_keys): Delete unused vars.
670 * composite.c (update_compositions): Declare arg.
672 * cm.c (calccost, cmgoto): Declare args.
674 * charset.c: Remove `emacs' conditional. Doc fixes.
675 (map_char_table_for_charset): Declare.
677 * character.c (syms_of_character) <translation-table-vector>: Doc
680 * ccl.c: Remove `emacs' conditional. Include hash table stuff
683 2002-07-26 Kenichi Handa <handa@etl.go.jp>
685 The following changes are to allow specifying multiple font
686 patterns for a character range (specified by script or charset).
688 * Makefile.in (abbrev.o): Depend on syntax.h.
689 (xfaces.o): Depend on charset.h.
691 * alloc.c (Fmake_string): Use ASCII_CHAR_P, not
694 * ccl.c (Fccl_execute_on_string): Add `const' to local variables.
696 * character.h (Vchar_script_table): Extern it.
698 * character.c (Vscript_alist): This variable deleted.
699 (Vchar_script_table, Qchar_script_table): New variable.
700 (syms_of_character): Declare Vchar_script_table as a lisp variable
703 * chartab.c (Fmake_char_table): Doc fixed. If PURPOSE doesn't
704 have property char-table-extra-slots, make no extra slot.
706 * dispextern.h (struct face): Member `charset' deleted.
707 (FACE_SUITABLE_FOR_CHAR_P): Use ASCII_CHAR_P, not
709 (FACE_FOR_CHAR): Likewise.
710 (choose_face_font, lookup_non_ascii_face, font_name_registry): Add
712 (lookup_face, lookup_named_face, lookup_derived_face): Prototype
714 (generate_ascii_font_name): Renamed from generate_ascii_font.
716 * fontset.h (get_font_repertory_func): New prototype.
717 (make_fontset_for_ascii_face, fs_load_font): Prototypes fixed.
718 (FS_LOAD_FONT): Call fs_load_font with the 3rd arg charset_ascii.
720 * fontset.c (Qprepend, Qappend): New variables.
721 (FONTSET_CHARSET_ALIST, FONTSET_FACE_ALIST): These macros deleted.
722 (FONTSET_NOFONT_FACE, FONTSET_REPERTORY): New macros.
723 (FONTSET_REF): Optimize if FONTSET is Vdefault_fontset.
724 (FONTSET_REF_AND_RANGE, FONTSET_ADD): New macros.
725 (fontset_ref_and_range, fontset_add, reorder_font_vector)
726 (load_font_get_repertory): New functions.
727 (fontset_set): This function deleted.
728 (fontset_face): New arg FACE. Return face ID, not face.
729 Completely re-written to handle new fontset structure. Caller
731 (free_face_fontset): Use ASET istead of AREF (X) = Y.
732 (face_for_char): Don't call lookup_face.
733 (make_fontset_for_ascii_face): New arg FACE.
734 (fs_load_font): New arg CHARSET_ID. Don't check
735 Vfont_encoding_alist here.
736 (find_font_encoding): New function.
737 (list_fontsets): Use STRINGP, not ! NILP.
738 (accumulate_script_ranges): New function.
739 (Fset_fontset_font, Fnew_fontset, Ffontset_info): Completely
740 re-written to handle new fontset structure.
741 (Ffontset_font): Return a copy of element.
742 (syms_of_fontset): Define symbols Qprepend and Qappend. Fix
743 docstring of font-encoding-alist.
745 * lisp.h (CHAR_TABLE_REF): Remove unnecessary check (IDX >= 0).
746 (Fset_fotset_font): Fix arguments to 5.
748 * msdos.c (XMenuActivate): Adjuted for the change of
751 * xdisp.c (message_dolog, set_message_1, extend_face_to_end_of_line):
752 Use ASCII_CHAR_P, not SINGLE_BYTE_CHAR_P.
753 (highlight_trailing_whitespace): Adjusted for the change of
756 * xfaces.c: Include charset.h.
757 (load_face_font): Argument C deleted. Caller changed.
758 (generate_ascii_font_name): Renamed from generate_ascii_font.
759 (font_name_registry): New function.
760 (cache_face): Store ascii faces before non-ascii faces in buckets.
761 (lookup_face): Arguments C and BASE_FACE deleted. Caller changed.
762 Lookup only ascii faces.
763 (lookup_non_ascii_face): New function.
764 (lookup_named_face): Argument C deleted. Caller changed.
765 (lookup_derived_face): Argument C deleted. Caller changed.
766 (try_font_list): New arg PATTERN. Caller changed. If PATTERN is
767 a string, just call font_list with it.
768 (choose_face_font): Arguments FACE and C deleted. New arg
769 FONT_SPEC. Caller changed.
770 (realize_face): Arguments C and BASE_FACE deleted. Caller
771 (realize_x_face): Likewise.
772 (realize_non_ascii_face): New function.
773 (realize_x_face): Call load_face_font here.
774 (realize_tty_face): Argument C deleted. Caller changed.
775 (compute_char_face): If CH is not ascii, call FACE_FOR_CHAR to
777 (dump_realized_face): Don't print charset of FACE.
779 * xfns.c (x_set_font): Always call x_new_fontset and
780 store_frame_parameter.
781 (Fx_create_frame): Call x_new_fontset, not x_new_font.
782 (syms_of_xfns): Set get_font_repertory_func to
783 x_get_font_repertory.
785 * xterm.h (x_get_font_repertory): Extern it.
787 * xterm.c (x_produce_glyphs): Use ASCII_CHAR_P, not
788 SINGLE_BYTE_CHAR_P. Fix the logic of handling non-ASCII char when
789 it->multibyte_p is zero.
790 (XTread_socket): Use ASCII_CHAR_P, not SINGLE_BYTE_CHAR_P.
791 (x_new_fontset): If FONTSETNAME doesn't match any existing
792 fontsets, create a new one.
793 (x_get_font_repertory): New function.
795 2002-07-25 Kenichi Handa <handa@etl.go.jp>
797 * coding.c (Ffind_coding_systems_region_internal): Detect an
798 ASCII only string correctly.
800 * lread.c (Fload): Don't load with Qload_force_doc_strings t if
803 2002-07-24 Kenichi Handa <handa@etl.go.jp>
805 * lread.c: Include "coding.h".
806 (Qget_emacs_mule_file_char, Qload_force_doc_strings,
807 load_each_byte, unread_char): New variables.
808 (readchar_backlog): This variable deleted.
809 (readchar): Return a character unless load_each_byte is nonzero.
810 Handle the case that readcharfun is Qget_emacs_mule_file_char or a
811 cons. If unread_char is not -1, simply return it.
812 (unreadchar): Handle the case that readcharfun is
813 Qget_emacs_mule_file_char or a cons. Set unread_char if
815 (read_multibyte): This function deleted.
816 (readbyte_for_lambda, readbyte_from_file, readbyte_from_string)
817 (read_emacs_mule_char): New functions.
818 (Fload): Even if the file doesn't have the extention ".elc", if
819 safe_to_load_p returns a positive version number, assume that the
820 file contains bytecompiled code. If the version is less than 22,
821 load the file while decoding multibyte sequences by emacs-mule.
822 (readevalloop): Don't use readchar_backlog.
823 (Fread): Likewise. Pay attention to the case that STREAM is a
825 (Fread_from_string): Pay attention to the case that STREAM is a
827 (read_escape): The arg BYTEREP deleted.
828 (read1): Set load_each_byte to 1 temporarily while handling
829 #@NUMBER. Don't call read_multibyte.
830 (read_vector): Call Fread with a cons. If readcharfun is
831 Qget_emacs_mule_file_char, decode the read string by emacs-mule.
832 (read_list): If doc_reference is 2, make the cdr part string as
834 (syms_of_lread): Intern and staticpro Qget_emacs_mule_file_char
835 and Qload_force_doc_strings.
837 2002-07-23 Kenichi Handa <handa@etl.go.jp>
839 * xdisp.c (face_before_or_after_it_pos): Call
840 FETCH_MULTIBYTE_CHAR with byte postion, not char position.
842 2002-07-22 Kenichi Handa <handa@etl.go.jp>
844 * character.h (TRAILING_CODE_P): New macro.
845 (MAYBE_UNIFY_CHAR): Adjusted for the change of Funify_charset.
846 (string_char_with_unification): Fix prototype.
847 (Vscript_alist): Extern it.
849 * character.c (Vscript_alist): New variable.
850 (string_char_with_unification): Add `const' to local variables.
851 (str_as_unibyte): Likewise.
852 (string_escape_byte8): Likewise.
853 (syms_of_character): Declare script-alist as a Lisp variable.
855 * charset.h (Vcharset_ordered_list): Extern it.
856 (charset_ordered_list_tick): Extern it.
857 (EMACS_MULE_LEADING_CODE_PRIVATE_11)
858 (EMACS_MULE_LEADING_CODE_PRIVATE_12)
859 (EMACS_MULE_LEADING_CODE_PRIVATE_21)
860 (EMACS_MULE_LEADING_CODE_PRIVATE_22): New macros
861 (Funify_charset): Adjusted for the change of Funify_charset.
863 * charset.c (charset_ordered_list_tick): New variable.
864 (Fdefine_charset_internal): Increment charset_ordered_list_tick.
865 (Funify_charset): New optional arg DEUNIFY. If it is non-nil,
866 deunify intead of unify a charset.
867 (string_xstring_p): Add `const' to local variables.
868 (find_charsets_in_text): Add `const' to arguemnts and local
870 (encode_char): Adjusted for the change of Funify_charset. Fix
871 detecting of invalid code.
872 (Fset_charset_priority): Increment charset_ordered_list_tick.
873 (Fmap_charset_chars): Fix handling of default value for FROM_CODE
876 * coding.c (LEADING_CODE_PRIVATE_11, LEADING_CODE_PRIVATE_12)
877 (LEADING_CODE_PRIVATE_21, LEADING_CODE_PRIVATE_22): Macros
878 deleted. Callers changed to use
879 EMACS_MULE_LEADING_CODE_PRIVATE_11, etc.
880 (decode_coding_ccl): Add `const' to local variables.
881 (consume_chars): Likewise.
882 (Ffind_coding_systems_region_internal): Likewise.
883 (Fcheck_coding_systems_region): Likewise.
885 * print.c (print_object): Use octal form for printing the
886 contents of a bool vector.
888 2002-07-18 Dave Love <fx@gnu.org>
890 * lread.c (Fload) <!load_dangerous_libraries>: Don't leak fd.
891 <version == 20>: Refuse to load.
893 2002-07-17 Dave Love <fx@gnu.org>
895 * fns.c: Move coding.h.
896 (Qcodeset, Qdays, Qmonths): New.
897 (concat): Use CHARACTERP instead of INTERGERP.
898 (Flocale_codeset): Deleted.
899 (Flanginfo): New function.
900 (syms_of_fns): Changed accordingly.
902 * coding.c (adjust_coding_eol_type): Fix eol_type/eol_seen mixup.
904 2002-07-16 Dave Love <fx@gnu.org>
906 * casetab.c (init_casetab_once, init_casetab_once): Fix
909 * category.c (Fmodify_category_entry): Fix CATEGORY_MEMBER call.
911 * character.c (syms_of_character): Fix CHAR_TABLE_SET call.
913 * charset.c (Fmap_charset_chars): Check args. Convert Lisp types.
914 (load_charset_map, Fdeclare_equiv_charset, Fencode_char)
915 (Fset_charset_priority, syms_of_charset): Convert Lisp types.
917 * charset.h (CHECK_CHARSET_GET_ID): Use XINT on AREF result.
919 * coding.c (ENCODE_DESIGNATION, decode_eol)
920 (make_conversion_work_buffer, code_conversion_restore)
921 (Fdefine_coding_system_internal): Convert Lisp types.
922 (code_conversion_restore): Use EQ, not ==.
923 (Fencode_coding_string): Fix code_convert_string call.
925 * coding.h (code_convert_region): Fix prototype.
927 * dispextern.h (redraw_frame, redraw_garbaged_frames): Removed.
929 * fontset.c (fontset_ref, fontset_set, fs_load_font)
930 (Ffontset_info): Convert Lisp types.
932 * syntax.h (SYNTAX_ENTRY_INT): Don't use make_number.
934 * xterm.c (note_mouse_movement): Fix call of window_from_coordinates.
936 * xdisp.c (display_mode_element): Fix call of Fset_text_properties.
938 * chartab.c: Include "...h", not <...h> in some cases.
940 * callproc.c (Fcall_process): Remove unused variables.
942 2002-07-12 Dave Love <fx@gnu.org>
944 * coding.c (Fset_coding_system_priority): Allow null arg list.
946 2002-07-03 Dave Love <fx@gnu.org>
948 * minibuf.c (Fminibuffer_complete_word): Remove unused var.
949 (Fself_insert_and_exit): Use CHARACTERP.
951 * callproc.c (Fcall_process): Remove unused vars.
953 * xterm.c (XTread_socket): Add extra dead keysyms.
955 * xdisp.c (decode_mode_spec_coding): Use CHARACTERP.
957 * dispextern.h: Remove prototypes for redraw_frame,
958 redraw_garbaged_frames.
960 * cmds.c (Fself_insert_command): Use CHARACTERP.
962 * chartab.c (make_sub_char_table): Remove unused var.
963 (Fset_char_table_default, Fmap_char_table): Doc fix.
965 * keymap.c (access_keymap): Remove generic char code.
966 (push_key_description): Use CHARACTERP.
968 2002-07-01 Dave Love <fx@gnu.org>
970 * charset.c: Doc fixes.
971 (Funify_charset): Extra checking.
973 2002-06-24 Dave Love <fx@gnu.org>
975 * lread.c: Remove some unused variables.
976 (safe_to_load_p): If safe, return the magic number version byte.
977 (Fload): Maybe use load-with-code-conversion.
979 2002-06-12 Kenichi Handa <handa@etl.go.jp>
981 * category.c (Fmodify_category_entry): Don't modify the contents
982 of category_set for characters out of the range. Avoid
983 unnecessary modification.
985 * character.h (MAYBE_UNIFY_CHAR): Adjusted for the change of
986 Vchar_unify_table. The default value of the table is now nil.
988 * character.c (syms_of_character): Setup Vchar_width_table for
989 eight-bit-control and raw-byte chars.
991 * charset.h (enum define_charset_arg_index): Delete
992 charset_arg_parents and add charset_arg_subset and
993 charset_arg_superset.
994 (enum charset_attr_index): Delete charset_parents and add
995 charset_subset and charset_superset.
996 (enum charset_method): Delete CHARSET_METHOD_INHERIT and add
997 CHARSET_METHOD_SUBSET and CHARSET_METHOD_SUPERSET.
998 (CHARSET_ATTR_PARENTS, CHARSET_PARENTS): Macros deleted.
999 (CHARSET_ATTR_SUBSET, CHARSET_ATTR_SUPERSET, CHARSET_SUBSET)
1000 (CHARSET_SUPERSET): New macros.
1001 (charset_work): Extern it.
1002 (ENCODE_CHAR): Use charset_work.
1003 (CHAR_CHARSET_P): Adjusted for the change of encoder format.
1004 (map_charset_chars): Extern it.
1006 * charset.c (load_charset_map): Set the default value of encoder
1007 and deunifier char-tables to nil.
1008 (map_charset_chars): Argument changed. Callers changed. Use
1009 map_char_table_for_charset instead of map_char_table.
1010 (Fmap_charset_chars): New optional args from_code and to_code.
1011 (Fdefine_charset_internal): Adjusted for the change of
1012 `define-charset' (:parents -> :subset or :superset).
1013 (charset_work): New variable.
1014 (encode_char): Adjusted for the change of
1015 Fdefine_charset_internal.
1016 (syms_of_charset): Likewise.
1017 (Ffind_charset_string): Setup the vector `charsets' correctly.
1019 * chartab.c (sub_char_table_ref_and_range): New arg defalt. Fix
1020 the previous change.
1021 (char_table_ref_and_range): Adjusted for the above change.
1022 (map_sub_char_table_for_charset): New function.
1023 (map_char_table_for_charset): New function.
1025 * keymap.c (describe_vector): Handle a char-table directly here.
1026 (describe_char_table): Deleted.
1028 * lisp.h (map_charset_chars): Deleted.
1030 2002-06-11 Dave Love <fx@gnu.org>
1032 * fns.c (count_combining): Comment out (unused).
1033 (Flocale_codeset): New.
1034 (syms_of_fns): Defsubr it.
1036 * config.in (HAVE_PTY_H, HAVE_SIZE_T, HAVE_LANGINFO_CODESET): New.
1039 2002-06-06 Dave Love <fx@gnu.org>
1041 * Makefile.in (chartab.o): Depend on charset.h
1043 2002-06-03 Kenichi Handa <handa@etl.go.jp>
1045 * character.c (syms_of_character): Set the default value of
1046 Vprintable_chars to Qnil.
1048 2002-05-31 Dave Love <fx@gnu.org>
1050 * Makefile.in (lisp, shortlisp): Change indian.elc to indian.el.
1052 2002-05-31 Kenichi Handa <handa@etl.go.jp>
1054 * charset.c (load_charset_map): Handle the case that from < to
1057 * coding.c (encode_coding_emacs_mule): Pay attention to raw-8-bit
1059 (encode_coding_iso_2022): Likewise.
1060 (encode_coding_sjis): Likewise.
1061 (encode_coding_big5): Likewise.
1062 (encode_coding_charset): Likewise.
1064 2002-05-30 Kenichi Handa <handa@etl.go.jp>
1066 * Makefile.in (lisp): Change chinese.elc to chinese.el. They are
1067 not bytecompiled now.
1068 (shortlisp): Likewise.
1070 * charset.c (charset_jisx0201_roman, charset_jisx0208_1978)
1071 (charset_jisx0208): New variables.
1072 (Fdefine_charset_internal): Setup them if appropriate.
1073 (init_charset_once): Initialize them to -1.
1075 * charset.h (charset_jisx0201_roman, charset_jisx0208_1978,
1076 charset_jisx0208): Extern them.
1078 * coding.c (CODING_ISO_FLAG_USE_ROMAN): New macro
1079 (CODING_ISO_FLAG_USE_OLDJIS): New macro.
1080 (CODING_ISO_FLAG_FULL_SUPPORT): Macro definition changed.
1081 (setup_iso_safe_charsets): Fix arguemtns to Fassq.
1082 (DECODE_DESIGNATION): Pay attention to CODING_ISO_FLAG_USE_ROMAN
1083 and CODING_ISO_FLAG_USE_OLDJIS.
1084 (ENCODE_ISO_CHARACTER_DIMENSION1): Likewise.
1085 (ENCODE_ISO_CHARACTER_DIMENSION2): Likewise.
1086 (encode_coding_iso_2022): Change the 1st arg to
1087 ENCODE_ISO_CHARACTER to a variable.
1089 2002-05-29 Kenichi Handa <handa@etl.go.jp>
1091 * charset.h (enum define_charset_arg_index): New enums
1092 charset_arg_min_code and charset_arg_max_code.
1093 (struct charset): New member char_index_offset.
1095 * charset.c (CODE_POINT_TO_INDEX): Take charset->char_index_offset
1097 (INDEX_TO_CODE_POINT): Likewise.
1098 (Fdefine_charset_internal): Handle args[charset_arg_min_code] and
1099 args[charset_arg_max_code]. Setup charset.char_index_offset.
1100 (syms_of_charset): Fix args to Fdefine_charset_internal.
1102 2002-05-27 Dave Love <fx@gnu.org>
1104 * coding.c (decode_coding_utf_8): Reject overlong sequences.
1106 2002-05-26 Dave Love <fx@gnu.org>
1108 * coding.c: Doc fixes.
1109 (Fcoding_system_aliases): Fix return value.
1110 (Qmac): Remove (duplicated) definition.
1112 2002-05-25 Dave Love <fx@gnu.org>
1114 * charset.c (Fcharset_priority_list, Fset_charset_priority): New
1117 * character.c (Fstring): Doc fix.
1119 * charset.c (Fdefine_charset_alias): Update Vcharset_list.
1121 * fontset.c (Ffontset_info): Doc fix. Return charset names, not
1123 (font-encoding-alist): Doc fix.
1125 2002-05-24 Dave Love <fx@gnu.org>
1127 * term.c (costs_set): Declare static, non-initialized for pcc.
1128 (encode_terminal_code): Remove ensued var.
1130 * keyboard.c (kbd_buffer_store_event): Fix interrupt_signal decl
1133 * xterm.c (xlwmenu_window_p): Fix prototype for K&R.
1135 * coding.c (setup_iso_safe_charsets): Fix arg decl for K&R.
1136 (suffixes): Moved out of make_subsidiaries for K&R.
1138 * charset.c (map_charset_chars): Fix c_function declaration for
1141 * lisp.h (DEFUN) [!PROTOTYPES]: Remove spurious `args'.
1143 2002-05-23 Dave Love <fx@gnu.org>
1145 * data.c (Fchar_or_string_p): Doc fix. Use CHARACTERP.
1147 * category.c (Fmodify_category_entry): Doc fix. Remove unused
1150 2002-05-23 Yong Lu <lyongu@asia-infonet.com>
1152 * charset.c (Fdefine_charset_internal): Fix argument to bzero.
1154 * coding.c (Fdefine_coding_system_internal): Fix previous change.
1155 (decode_coding_charset): Workaround for the bug of GCC 2.96.
1157 2002-05-23 Kenichi Handa <handa@etl.go.jp>
1159 * Makefile.in (lisp): Change cyrillic.elc to cyrillic.el,
1160 vietnamese.elc to vietnamese.el. They are not bytecompiled now.
1161 (shortlisp): Likewise.
1163 2002-05-22 Kenichi Handa <handa@etl.go.jp>
1165 * coding.c (decode_coding_charset): Adjusted for the change of
1166 Fdefine_coding_system_internal.
1167 (Fdefine_coding_system_internal): For a coding system of
1168 `charset' type, store a list of charset IDs in
1169 `charset_attr_charset_valids' element of coding attributes.
1171 * charset.c (Fmake_char): Fix previous change.
1173 2002-05-21 Kenichi Handa <handa@etl.go.jp>
1175 * coding.c (ONE_MORE_BYTE_NO_CHECK): Increment consumed_chars.
1176 (emacs_mule_char): New arg src. Delete arg `composition'. Caller
1177 changed. Handle 2-byte and 3-byte charsets correctly.
1178 (DECODE_EMACS_MULE_COMPOSITION_RULE_20): Renamed from
1179 DECODE_EMACS_MULE_COMPOSITION_RULE. Caller changed.
1180 (DECODE_EMACS_MULE_COMPOSITION_RULE_21): New macro.
1181 (DECODE_EMACS_MULE_21_COMPOSITION): Call
1182 DECODE_EMACS_MULE_COMPOSITION_RULE_21. Produce correct annotation
1184 (decode_coding_emacs_mule): Handle composition correctly. Rewind
1185 `src' and `consumed_chars' correctly before calling
1187 (DECODE_COMPOSITION_START): Correctly handle the case of altchar
1188 and alt&rule composition.
1189 (decode_coding_iso_2022): Handle composition correctly.
1190 (init_coding_once): Setup emacs_mule_bytes for private charsets.
1192 * charset.c (Fdefine_charset_internal): Fix bug for the case of
1193 re-defining a charset. If the charset has :emacs-mule-id, setup
1195 (Fmake_char): If CODE1 is nil, use the minimum code of the
1198 2002-05-20 Kenichi Handa <handa@etl.go.jp>
1200 * coding.c (encode_coding_iso_2022): If coding requires safe
1201 encoding, produce a character specified by
1202 CODING_INHIBIT_CHARACTER_SUBSTITUTION.
1203 (encode_coding_sjis): Likewise.
1204 (encode_coding_big5): Likewise.
1205 (encode_coding_charset): Likewise.
1207 2002-05-17 Dave Love <fx@gnu.org>
1209 * xterm.c (XSetIMValues): Declare.
1211 * process.c: Conditionally include sys/wait.h, pty.h.
1213 * print.c (print_object): Fix print format for 64-bit
1216 * keyboard.c (modify_event_symbol): Fix print format for 64-bit
1219 * buffer.c (emacs_strerror): Declare.
1220 (MMAP_ALLOCATED_P, mmap_enlarge, syms_of_buffer): Import changes
1223 * fontset.c (Fclear_face_cache): Declare.
1224 (accumulate_font_info): Commented-out (unused).
1225 (face_for_char, Fset_fontset_font, Ffontset_info): Remove unused
1228 * character.h (string_escape_byte8): Declare.
1230 * charset.c (load_charset_map, load_charset_map_from_file): Remove
1232 (Fdefine_charset_internal, Fsplit_char, syms_of_charset)
1233 (Fmap_charset_chars): Doc fix.
1235 * coding.c (Vchar_coding_system_table, Qchar_coding_system):
1237 (Fset_coding_system_priority, Fset_coding_system_priority)
1238 (Fdefine_coding_system_internal): Doc fix.
1240 2002-05-16 Dave Love <fx@gnu.org>
1242 * s/osf5-0.h (C_SWITCH_SYSTEM) [!__GNUC__]: Remove -nointrinsics.
1244 2002-05-16 Kenichi Handa <handa@etl.go.jp>
1246 * character.c (string_escape_byte8): Make multibyte string with
1249 * charset.c (Fmake_char): Delete unnecessary code.
1251 2002-05-14 Kenichi Handa <handa@etl.go.jp>
1253 * xfns.c (x_encode_text): Allocate coding.destination here, and
1254 call encode_coding_object with dst_object Qnil.
1256 * buffer.c (Fset_buffer_multibyte): Convert 8-bit bytes to
1257 multibyte form correctly.
1259 * fontset.c (fs_load_font): Check fontp->full_name (not fontname)
1260 against Vfont_encoding_alist.
1262 * coding.c (Fdecode_sjis_char): Fix typo (0x7F->0xFF). Fix the
1263 handling of charset list.
1264 (encode_coding_iso_2022): Setup coding->safe_charsets in advance.
1265 (decode_coding_object): Move point to coding->dst_pos before
1266 calling post-read-conversion function.
1267 (encode_coding_object): Give correct arguments to
1268 pre-write-conversion. Ignore the return value of
1269 pre-write-conversion function. Pay attention to the case that
1270 pre-write-conversion changes the current buffer. If dst_object is
1271 Qt, even if coding->src_bytes is zero, allocate at least one byte
1272 to coding->destination.
1274 * coding.h (JIS_TO_SJIS): Fix typo (j1->s1, j2->s2).
1276 * charset.c (Fmake_char): Make it more backward compatible.
1277 (Fmap_charset_chars): Fix docstring.
1279 2002-05-13 Dave Love <fx@gnu.org>
1281 * coding.c: Doc fixes.
1282 (Fdefine_coding_system_alias): Use names, not symbols, in
1283 coding-system-alist.
1285 2002-05-13 Kenichi Handa <handa@etl.go.jp>
1287 * fontset.c (free_realized_fontsets): Call Fclear_face_cache instead
1288 of calling free_realized_face.
1290 2002-05-10 Yong Lu <lyongu@asia-infonet.com>
1292 * charset.c (load_charset_map): Fix previous change.
1293 (read_hex): Don't treat SPC as a comment starter.
1294 (decode_char): If CODE_POINT_TO_INDEX retruns -1, always return
1296 (Fdecode_char): Fix typo.
1298 2002-05-10 Kenichi Handa <handa@etl.go.jp>
1300 * charset.h (struct charset): New member `code_space_mask'.
1302 * coding.c (coding_set_source): Delete the local variable
1304 (encode_coding_charset): Delete the local variable charset.
1305 (Fdefine_coding_system_internal): Likewise.
1306 (Fdefine_coding_system_internal): Setup
1307 attrs[coding_attr_charset_valids] correctly.
1309 * charset.c (CODE_POINT_TO_INDEX): Utilize `code_space_mask'
1310 member to check if CODE is valid or not.
1311 (Fdefine_charset_internal): Initialize `code_space_mask' member.
1312 (encode_char): Before calling CODE_POINT_TO_INDEX, check if CODE
1313 is within the range of charset->min_code and carset->max_code.
1315 2002-05-09 Dave Love <fx@gnu.org>
1317 * syntax.h (syntax_temp) [!__GNUC__]: Declare.
1319 * dispextern.h (generate_ascii_font): Fix return type.
1321 * xfaces.c (generate_ascii_font): Fix arg declaration.
1323 * coding.c (coding_inherit_eol_type)
1324 (Fset_terminal_coding_system_internal)
1325 (Fset_safe_terminal_coding_system_internal): Fix arg declarations.
1327 2002-05-08 Kenichi Handa <handa@etl.go.jp>
1329 * coding.c (decode_coding_charset, encode_coding_charset): Handle
1330 multiple charsets correctly.
1332 2002-05-07 Kenichi Handa <handa@etl.go.jp>
1334 * search.c (boyer_moore): Fix handling of mulitbyte character
1337 * xdisp.c (display_mode_element): When the variable `elt' is
1338 changed, update `this' and `lisp_string'.
1340 2002-05-07 Kenichi Handa <handa@etl.go.jp>
1342 * buffer.c (Fset_buffer_multibyte): Fix 8-bit char handling.
1344 * callproc.c (Fcall_process): Be sure to give the current buffer
1345 to decode_coding_c_string. Update PT and PT_BYTE after the
1348 * charset.c (struct charset_map_entries): New struct.
1349 (load_charset_map): Renamed from parse_charset_map. New args
1350 entries and n_entries. Caller changed.
1351 (load_charset_map_from_file): Renamed from load_charset_map.
1352 Caller changed. New arg control_flag. Call load_charset_map at
1354 (load_charset_map_from_vector): New function.
1355 (Fdefine_charset_internal): Setup charset.compact_codes_p.
1356 (encode_char): If the charset is compact, change a character index
1359 * coding.c (coding_alloc_by_making_gap): Check the case that the
1360 source and destination are the same correctly.
1361 (decode_coding_raw_text): Set coding->consumed_char and
1362 coding->consumed to 0.
1363 (produce_chars): If coding->chars_at_source is nonzero, update
1364 coding->consumed_char and coding->consumed before calling
1366 (Fdefine_coding_system_alias): Register ALIAS in
1367 Vcoding_system_alist.
1368 (syms_of_coding): Define `no-convesion' coding system at the tail.
1370 * fileio.c (Finsert_file_contents): Set coding_system instead of
1371 val. If the current buffer is multibyte, always call
1374 * xfaces.c (try_font_list): Give higher priority to fontset's
1375 family than face's family.
1377 2002-04-18 Kenichi Handa <handa@etl.go.jp>
1379 * callproc.c (Fcall_process): Be sure to give the current buffer
1380 to decode_coding_c_string.
1382 * xfaces.c (try_font_list): Give a family specified in a fontset
1383 higher priority than a family specified in a face.
1385 2002-04-09 Kenichi Handa <handa@etl.go.jp>
1387 * fileio.c (Finsert_file_contents): Fix calculation of `inserted'.
1388 Fix arguments to insert_from_buffer.
1390 * xdisp.c (display_mode_element): Fix calculation of `bytepos'.
1392 2002-03-11 Kenichi Handa <handa@etl.go.jp>
1394 * coding.c (produce_chars): Set the variable `multibytep' correctly.
1395 (decode_coding_gap): Set coding->dst_multibyte correctly.
1397 2002-03-07 Kenichi Handa <handa@etl.go.jp>
1399 * coding.c (encode_coding_utf_8): Initialize produced_chars to 0.
1400 (decode_coding_utf_16): Fix converting high and low bytes to
1402 (encode_coding_utf_16): Substitute coding->default_char for
1403 non-Unicode characters.
1404 (decode_coding): Don't call record_insert here.
1405 (setup_coding_system): Initialize `surrogate' of
1406 coding->spec.utf_16 to 0.
1407 (EMIT_ONE_BYTE): Fix for multibyte case.
1409 * insdel.c (insert_from_gap): Call record_insert.
1411 2002-03-04 Kenichi Handa <handa@etl.go.jp>
1413 * casefiddle.c (casify_region): Fix multibyte case.
1415 * character.c (c_string_width): Add return type `int'.
1416 (char_string_with_unification): Arg ADVANCED deleted.
1418 * character.h (CHAR_VALID_P): Don't call CHARACTERP.
1419 (CHAR_STRING): Adjusted for the change of
1420 char_string_with_unification.
1421 (CHAR_STRING_ADVANCE): Make it do-while statement.
1423 * chartab.c (sub_char_table_set_range): Optimized for the case
1424 DEPTH == 3. Add workaround code for a GCC optimization bug.
1426 * charset.c (parse_charset_map): Remove an unused variable.
1428 * coding.c: Delete unused variables.
1430 * fileio.c (Finsert_file_contents): Set coding_system to Qnil
1431 earlier. If inserted is zero and the coding system doesn't
1432 require flushing, don't call decode_coding_gap.
1434 * syntax.h (SET_RAW_SYNTAX_ENTRY): Don't call make_number.
1436 2002-03-01 Kenichi Handa <handa@etl.go.jp>
1438 The following changes are for using Unicode as an internal
1439 character model, and use UTF-8 format for buffer/string
1442 * .gdbinit (xchartable): Adjusted for the change of char table
1444 (xsubchartable, xcoding, xcharset, xcurbuf): New commands.
1446 * Makefile.in (obj): Add character.o and chartab.o.
1447 (lisp, shortlisp): Remove utf-8.elc:
1448 (*.o): For many files, change dependency on charset.h to
1449 character.h, and add dependency on character.h.
1450 (character.o, chartab.o): New targets.
1452 * abbrev.c, bytecode.c, casefiddle.c, cmds.c, dispnew.c, doc.c,
1453 doprnt.c, dosfns.c, frame.c, marker.c, minibuf.c, msdos.c,
1454 w16select.c, w32bdf.c, w32console.c: Include "character.h" instead
1457 * dired.c, filelock.c: Include "character.h".
1459 * alloc.c: Include "character.h" instead of "charset.h".
1460 (Fmake_char_table): Moved to chartab.c.
1461 (make_sub_char_table): Likewise.
1462 (syms_of_alloc): Remove defsubr for Smake_char_table.
1464 * buffer.c: Include "character.h" instead of "charset.h", don't
1466 (Fset_buffer_multibyte): Adjuted for UTF-8.
1468 * buffer.h: EXFUN Fbuffer_live_p.
1470 * callproc.c: Include "character.h" instead of "charset.h".
1471 (Fcall_process): Big change for the new code-conversion APIs.
1473 * casetab.c: Include "character.h" instead of "charset.h".
1474 (set_canon, set_identity, shuffle): Adjusted for the new
1475 map_char_table spec.
1476 (init_casetab_once): Call CHAR_TABLE_SET instead of directly
1477 accessing the char table structure.
1479 * chartab.c: New file that implements char table.
1481 * category.c: Include "character.h".
1482 (copy_category_entry): New function.
1483 (copy_category_table): Call map_char_table and copy_category_entry.
1484 (Fmake_category_table): Initialize all top-vel slots.
1485 (char_category_set): New function.
1486 (modify_lower_category_set): Deleted.
1487 (Fmodify_category_entry): Call char_table_ref_and_range.
1489 * category.h (CATEGORY_SET): Just call char_category_set.
1491 * ccl.c: Include "character.h".
1492 (Qccl, Qcclp): New variables.
1493 (CCL_WRITE_CHAR): Alway treat the arg CH as a character even if
1495 (CCL_WRITE_MULTIBYTE_CHAR): Deleted.
1496 (CCL_WRITE_STRING, CCL_READ_CHAR): Adjusted for the change of SRC
1498 (ccl_driver): Types of arguments changed. Code adjusted for that.
1499 (Fccl_execute, Fccl_execute_on_string): Adjusted for the change of
1501 (syms_of_ccl): Intern and staticpro Qccl and Qcclp.
1503 * ccl.h (struct ccl_program): Members eol_type and multibyte
1504 deleted. New members src_multibyte, dst_multibyte, consumed, and
1506 (struct ccl_spec): Members decoder and encoder deleted. New
1508 (CODING_SPEC_CCL_PROGRAM): New macro.
1509 (ccl_driver): Prototype updated.
1510 (Qccl, Qcclp, Fccl_program_p): Extern them.
1511 (CHECK_CCL_PROGRAM): New macro.
1513 * character.c, character.h, chartab.c: New files.
1515 * charset.c: Mostly re-written. Character and multibyte sequence
1516 handling codes are moved to character.c.
1518 * charset.h: Mostly re-written. Character and multibyte sequence
1519 handling codes are moved to character.h.
1521 * coding.c, coding.h: Mostly re-written.
1523 * composite.c: Include "character.h" instead of "charset.h".
1524 (CHAR_WIDTH): Moved to character.h.
1525 (HASH_KEY, HASH_VALUE): Deleted.
1527 * composite.h (enum composition_method): Order of enumeration
1530 * data.c: Include "character.h" instead of "charset.h".
1531 (Faref): Call CHAR_TABLE_REF for a char table.
1532 (Faset): Call CHAR_TABLE_SET for a char table.
1534 * dispextern.h (free_realized_face, check_face_attribytes,
1535 generate_ascii_font): Extern them.
1536 (free_realized_multibyte_face): Extern deleted.
1538 * disptab.h (DISP_CHAR_VECTOR): Adjusted for the change of char
1541 * editfns.c: Include "character.h" instead of "charset.h".
1542 (Fchar_to_string): Always call CHAR_STRING.
1544 * emacs.c (main): Call init_charset_once, init_charset,
1545 syms_of_chartab, and syms_of_character.
1547 * fileio.c: Include "character.h" instead of "charset.h".
1548 (Finsert_file_contents): Big change for the new code-conversion
1550 (choose_write_coding_system): Likewise.
1551 (Fwrite_region): Likewise.
1552 (build_annotations_2): Deleted.
1553 (e_write): Big change for the new code-conversion API.
1555 * fns.c: Include "character.h" instead of "charset.h".
1556 (copy_sub_char_table): Moved to chartab.c.
1557 (Fcopy_sequence): Call copy_char_table for a char table.
1558 (concat): Delete codes calling count_multibyte.
1559 (string_char_to_byte): Adjusted for the new multibyte form.
1560 (string_byte_to_char): Likewise.
1561 (internal_equal): Adjusted for the change of char table structure.
1562 (Fchar_table_subtype, Fchar_table_parent, Fset_char_table_parent,
1563 Fchar_table_extra_slot, Fset_char_table_extra_slot,
1564 Fchar_table_range, Fset_char_table_range, Fset_char_table_default,
1565 char_table_translate, optimize_sub_char_table,
1566 Foptimize_char_table, map_char_table, Fmap_char_table): Moved to
1568 (char_table_ref_and_index): Deleted.
1569 (HASH_KEY, HASH_VALUE): Moved to lisp.h.
1570 (Fmd5): Call preferred_coding_system instead of accessing
1571 Vcoding_category_list. Adjusted for the new code-conversion API.
1572 (syms_of_fns): Defsubr for char table related functions moved to
1575 * fontset.c: Mostly re-written.
1577 * fontset.h (struct font_info): Type of the member encoding_type
1579 (enum FONT_SPEC_INDEX): New enum.
1580 (fontset_font_pattern, fs_load_font): Prototype updated.
1581 (FS_LOAD_FONT): Adjusted for the change of fs_load_font.
1583 * indent.c: Include "character.h" instead of "charset.h".
1584 (MULTIBYTE_BYTES_WIDTH): Call CHAR_WIDTH instead of
1587 * insdel.c: Include "character.h" instead of "charset.h".
1588 (copy_text): Don't refer to Vnonascii_translation_table.
1589 (insert_from_gap): New function.
1591 * keyboard.c: Include "character.h" instead of "charset.h".
1592 (command_loop_1): Never call direct_output_forward_char before
1593 a non-ASCII character.
1594 (read_char): If Vkeyboard_translate_table is a char table, always
1595 translated a character.
1597 * keymap.c: Include "character.h".
1598 (store_in_keymap): Handle the case that IDX is a cons.
1599 (Fdefine_key): Handle the case that KEY is a cons and the car part
1600 is also a cons (range).
1601 (push_key_description): Adjusted for the new character code.
1602 (describe_vector): Call describe_char_table for a char table.
1603 (describe_char_table): New function.
1605 * keymap.h (describe_char_table): Extern it.
1607 * lisp.h (enum pvec_type): New member PVEC_SUB_CHAR_TABLE.
1608 (XSUB_CHAR_TABLE, XSETSUB_CHAR_TABLE): New macros.
1609 (CHAR_TABLE_ORDINARY_SLOTS, CHAR_TABLE_SINGLE_BYTE_SLOTS,
1610 SUB_CHAR_TABLE_ORDINARY_SLOTS, SUB_CHAR_TABLE_STANDARD_SLOTS):
1612 (CHAR_TABLE_REF, CHAR_TABLE_SET): Adjusted for the new char table
1614 (CHAR_TABLE_TRANSLATE): Just call char_table_translate.
1615 (CHARTAB_SIZE_BITS_0, CHARTAB_SIZE_BITS_1, CHARTAB_SIZE_BITS_2,
1616 CHARTAB_SIZE_BITS_3): New macros.
1617 (chartab_size): Extern it.
1618 (struct Lisp_Char_Table): Re-designed.
1619 (struct Lisp_Sub_Char_Table): New structure.
1620 (HASH_KEY, HASH_VALUE): Moved from fns.c.
1621 (CHARACTERBITS): Defined as 22.
1622 (GLYPH_MASK_FACE, GLYPH_MASK_CHAR): Adjusted for the above change.
1623 (SUB_CHAR_TABLE_P): Check PVEC_CHAR_TABLE.
1624 (GC_SUB_CHAR_TABLE_P): New macro.
1625 (Fencode_coding_string, Fdecode_coding_string): EXFUN Updated.
1626 (code_convert_string_norecord): Extern deleted.
1627 (init_character_once, syms_of_character, init_charset,
1628 syms_of_composite, Qeq, Fmakehash, insert_from_gap): Extern them.
1630 * lread.c: Include "character.h".
1631 (read_multibyte): New arg NBYTES.
1632 (read_escape): The meaning of returned *BYTEREP changed.
1633 (to_multibyte): Deleted.
1634 (read1): Adjuted the handling of char table and string.
1636 * print.c: Include "character.h" instead of "charset.h".
1637 (print_string): Convert 8-bit raw bytes to octal form by
1638 string_escape_byte8.
1639 (print_object): Adjusted for the new multibyte form. Print 8-bit
1640 raw bytes always in octal form. Handle sub char table correctly.
1642 * process.c: Include "character.h" instead of "charset.h".
1643 (read_process_output): Adjusted for the new code-conversion API.
1644 (send_process): Likewise.
1646 * puresize.h (BASE_PURESIZE): Increased.
1648 * regex.c: Include "character.h" instead of "charset.h".
1649 (BYTE8_TO_CHAR, CHAR_BYTE8_P) [not emacs]: New dummy macros.
1650 (regex_compile): Accept a range whose starting and ending
1651 character have different leading bytes.
1652 (analyse_first): Adjusted for the above change.
1654 * search.c: Include "character.h" instead of "charset.h".
1655 (search_buffer, boyer_moore): Adjusted for the new multibyte form.
1656 (Freplace_match): Adjusted for the change of
1657 multibyte_char_to_unibyte.
1659 * syntax.c: Include "character.h" instead of "charset.h".
1660 (syntax_parent_lookup): Deleted.
1661 (Fmodify_syntax_entry): Accept a cons as CHAR.
1662 (skip_chars): Adjusted for the new multibyte form.
1663 (init_syntax_once): Call char_table_set_range instead of directly
1664 accessing the structure of a char table.
1666 * syntax.h (SET_RAW_SYNTAX_ENTRY): Call CHAR_TABLE_SET.
1667 (SYNTAX_ENTRY_FOLLOW_PARENT): Macro deleted.
1668 (SET_RAW_SYNTAX_ENTRY_RANGE): New macro.
1669 (SYNTAX_ENTRY_INT): Call CHAR_TABLE_REF.
1671 * term.c: Include "buffer.h" and "character.h".
1672 (encode_terminal_code): Adjusted for the new code-conversion API.
1673 (write_glyphs): Likewise.
1674 (produce_glyphs): Call CHAR_WIDTH instead of CHARSET_WIDTH.
1676 * w32term.c (x_new_font): Adjusted for the change of FS_LOAD_FONT.
1678 * xdisp.c: Include "character.h".
1679 (get_next_display_element): Adjusted for the new multibyte form.
1680 (disp_char_vector): Adjusted for the new char table structure.
1681 (decode_mode_spec_coding): Adjusted for the new structure of
1683 (decode_mode_spec): Adjusted for the new code-conversion API.
1685 * xfaces.c: Include "character.h" instead of "charset.h".
1686 (load_face_font): Adjusted for the change of choose_face_font and
1688 (generate_ascii_font): New function.
1689 (set_lface_from_font_name): Adjusted for the change of
1691 (set_font_frame_param): Adjusted for the change of
1693 (free_realized_face): Make it public.
1694 (free_realized_faces_for_fontset): Renamed from
1695 free_realized_multibyte_face. Free also faces realized for ASCII.
1696 (choose_face_font): Argments changed. Adjusted for the change of
1697 fontset_font_pattern and FS_LOAD_FONT.
1699 * xfns.c: Include "character.h".
1700 (x_encode_text): Adjusted for the new code-conversion API.
1702 * xselect.c: Don't include "charset.h".
1703 (selection_data_to_lisp_data): Adjusted for the new code
1706 * xterm.c: Include "character.h".
1707 (x_encode_char): New argument CHARSET. Caller changed.
1708 (x_get_char_face_and_encoding): Call ENCODE_CHAR instead of
1710 (x_get_glyph_face_and_encoding): Likewise.
1711 (x_produce_glyphs): Don't check Vnonascii_translation_table Call
1712 CHAR_WIDTH instead of CHARSET_WIDTH.
1713 (XTread_socket): Adjusted for the new code-conversion API.
1714 (x_new_font): Adjusted for the change of FS_LOAD_FONT.
1715 (x_load_font): Adjusted for the change of struct font.
1718 ;; coding: iso-2022-7bit
1721 Copyright (C) 2002 Free Software Foundation, Inc.
1722 Copying and distribution of this file, with or without modification,
1723 are permitted provided the copyright notice and this notice are preserved.