1 2007-12-01 Jason Rumney <jasonr@gnu.org>
3 * w32font.c (w32font_driver): Add new fields.
5 2007-12-01 Kenichi Handa <handa@ni.aist.go.jp>
7 * config.in: Re-generated.
9 * Makefile.in (ALL_CFLAGS): Add @M17N_FLT_CFLAGS@.
10 (FONTSRC, FONTOBJ) [HAVE_WINDOW_SYSTEM]: Set them unconditionally.
11 (LIBES): Add @M17N_FLT_CFLAGS@.
13 * composite.c (compose_text): Don't treat the new style
14 composition specially.
16 * emacs.c (main): Call syms_of_font unconditionally.
18 * font.h (FONT_ENTITY_NOT_LOADABLE)
19 (FONT_ENTITY_SET_NOT_LOADABLE): New macros.
20 (LGSTRING_XXXX, LGLYPH_XXX): Adjusted for the change of lispy
22 (struct font_driver): New member shape.
23 (font_registry_charsets): Extern. it.
24 (font_find_for_lface): Prototype adjusted.
25 (font_prepare_composition): Likewise.
26 (font_otf_capability, font_drive_otf): Delete their externs.
28 * font.c [HAVE_M17N_FLT]: Include <m17n-flt.h>.
29 (font_charset_alist): Moved from xfont.c and renamed.
30 (font_registry_charsets): Likewise.
31 (font_prop_validate_otf): New function.
32 (font_property_table): Register it for QCotf.
33 (DEVICE_DELTA, adjust_anchor, REPLACEMENT_CHARACTER)
34 (font_drive_otf): Deleted.
35 (font_prepare_composition): New arg F. Adjusted for the change of
37 (font_find_for_lface): New arg C.
38 (font_load_for_face): Adjusted for the change of
40 (Ffont_make_gstring): Adjusted for the change of lispy gstring.
41 (Ffont_fill_gstring): Likewise.
42 (Ffont_shape_text): New function.
43 (Fopen_font): If the font size is not given, use 12-pixel.
44 (Ffont_at): New arg STRING.
45 (syms_of_font): Initalize font_charset_alist. Declare
46 Ffont_shape_text as a Lisp function. Call syms_of_XXfont
49 * fontset.c (fontset_find_font) [USE_FONT_BACKEND]: Try multiple
50 fonts of the same font-spec. Change the format of RFONT-DEF.
51 (face_for_char): Adjusted for the change of RFONT-DEF.
52 (make_fontset_for_ascii_face): Likewise.
53 (Finternal_char_font): Likewise.
54 (Fset_fontset_font) [USE_FONT_BACKEND]: Handle new format of
59 * ftfont.c: Don't include Freetype headers. Include "ftfont.h".
60 (struct ftfont_info) [HAVE_LIBOTF]: New members maybe_otf and otf.
61 (ftfont_open) [HAVE_LIBOTF]: Initialize the above members.
62 (ftfont_driver) [HAVE_LIBOTF, HAVE_M17N_FLT]: Don't set
63 font_otf_capability and font_drive_otf, set ftfont_shape.
64 (ftfont_list): Adjusted for the change of :otf property value.
65 (struct MFLTFontFT) [HAVE_LIBOTF, HAVE_M17N_FLT]: New struct.
66 (ftfont_get_glyph_id, ftfont_get_metrics, ftfont_check_otf)
67 (adjust_anchor, ftfont_drive_otf, ftfont_shape_by_flt)
68 (ftfont_shape) [HAVE_LIBOTF, HAVE_M17N_FLT]: New function.s
69 (DEVICE_DELTA) [HAVE_LIBOTF, HAVE_M17N_FLT]: New macro.
70 (otf_gstring, gstring, m17n_flt_initialized): New variables.
72 * w32term.c (x_draw_composite_glyph_string_foreground): Adjusted
73 for the change of lispy gstring.
75 * xdisp.c (handle_composition_prop): Adjusted for the change of
76 lispy gstring. Call a function for auto-composition with the
78 (fill_composite_glyph_string): Adjusted for the change of lispy
80 (x_produce_glyphs): Adjusted for the change of
81 font_prepare_compositionl.
83 * xfaces.c (set_font_frame_param): Adjusted for the change of
86 * xfont.c (x_font_charset_alist): Moved to font.c and renamed.
87 (xfont_registry_charsets): Likewise. Caller changed.
88 (syms_of_xfont): Don't handle x_font_charset_alist.
90 * xftfont.c: Include "ftfont.h".
91 (struct xftfont_info) [HAVE_LIBOTF]: New members maybe_otf and
93 (xftfont_open) [HAVE_LIBOTF]: Initialize the above members.
94 (xftfont_close) [HAVE_LIBOTF]: Close otf.
95 (xftfont_shape) [HAVE_LIBOTF, HAVE_M17N_FLT]: New function.
96 (syms_of_xftfont) [HAVE_LIBOTF, HAVE_M17N_FLT]: Set
97 xftfont_driver.shape to xftfont_shape.
99 * xterm.c (x_draw_composite_glyph_string_foreground): Adjusted for
100 the change of lispy gstring.
102 2007-11-29 Kenichi Handa <handa@ni.aist.go.jp>
104 * ftxfont.c (ftxfont_end_for_frame): Fix array indexing error.
106 2007-12-01 Jason Rumney <jasonr@gnu.org>
108 * w32font.c (w32font_draw): Fill background manually.
110 2007-11-23 Jason Rumney <jasonr@gnu.org>
112 * font.c (Qfontp): Remove unused symbol.
113 (QCantialias): New symbol.
114 (syms_of_font): Define it.
115 (font_property_table): Set a validator for QCantialias.
117 * w32font.c (CLEARTYPE_QUALITY, CLEARTYPE_NATURAL_QUALITY): Define
119 (QCfamily): Share with xfaces.c.
120 (Qstandard, Qsubpixel, Qnatural): New symbols.
121 (syms_of_w32font): Define them. Don't define QCfamily here.
122 (w32_antialias_type, lispy_antialias_type): New functions.
123 (w32_enumfont_pattern_entity): New arg requested_font.
124 Set antialias parameter if non-default was requested.
125 (fill_in_logfont): Fill in lfQuality if :antialias specified.
127 2007-11-21 Kenichi Handa <handa@ni.aist.go.jp>
129 * lread.c (read1): Undo the previous change.
131 2007-11-21 CHENG Gao <chenggao@gmail.com> (tiny change)
133 * frame.c (Fdelete_frame): Call font_update_drivers only when
134 USE_FONT_BACKEND is defined..
136 2007-11-19 Kenichi Handa <handa@ni.aist.go.jp>
138 * font.h (struct font_bitmap): New member bits_per_pixel.
139 (struct font_driver): New members start_for_frame and end_for_frame.
140 (struct font_data_list): New struct.
141 (font_put_frame_data, font_get_frame_data): Extern them.
143 * frame.h (struct frame): New member font_data_list.
145 * font.c (font_update_drivers): Call driver->start_for_frame and
146 driver->end_for_frame at proper timings.
147 (font_put_frame_data, font_get_frame_data): New functions.
148 (Ffont_spec): Add usage in the docstring.
150 * frame.c (make_frame): Initialize f->font_data_list to NULL.
151 (Fdelete_frame): Call font_update_drivers.
153 * xftfont.c (struct xftface_info): Delete the member xft_draw.
154 (xftfont_prepare_face): Adjusted for the above change.
155 (xftfont_done_face): Likewise.
156 (xftfont_get_xft_draw): New function.
157 (xftfont_draw): Get XftDraw by xftfont_get_xft_draw.
158 (xftfont_end_for_frame): New function.
159 (syms_of_xftfont): Set xftfont_driver.end_for_frame.
161 * ftxfont.c (ftxfont_get_gcs): Renamed from ftxfont_create_gcs.
162 Argument changed. Cache GCs in the per-frame data.
163 (struct ftxfont_frame_data): New struct.
164 (ftxfont_draw_bitmap): New arg gc_fore and flush.
165 (ftxfont_prepare_face, ftxfont_done_face): Delete them.
166 (ftxfont_draw): Get GCs by ftxfont_get_gcs. Reflect s->clip in
168 (ftxfont_end_for_frame): New function.
169 (syms_of_ftxfont): Set ftxfont_driver.end_for_frame.
171 * ftfont.c (ftfont_get_bitmap): Set bitmap->bits_per_pixel.
173 2007-11-18 Kenichi Handa <handa@m17n.org>
175 * xselect.c (Vselection_coding_system)
176 (Vnext_selection_coding_system): Delete them.
177 (syms_of_xselect): Don't declare selection-coding-system and
178 next-selection-coding-system. They are declared in select.el.
180 2007-11-17 Jason Rumney <jasonr@gnu.org>
182 * w32term.h (WM_UNICHAR, UNICODE_NOCHAR): Define if not already.
184 * w32fns.c: Include imm.h.
185 (get_composition_string_fn, get_ime_context_fn): New optional
187 (globals_of_w32fns): Load them from imm32.dll.
188 (ignore_ime_char): New flag.
189 (w32_wnd_proc): Handle WM_UNICHAR, WM_IME_CHAR and
190 WM_IME_ENDCOMPOSITION messages.
192 * w32term.c (w32_read_socket) [WM_UNICHAR]: Handle as
193 MULTIBYTE_CHAR_KEYSTROKE_EVENT.
195 2007-11-14 Kenichi Handa <handa@ni.aist.go.jp>
197 * lread.c (READCHAR): Call readchar with the 2nd arg NULL.
198 (READCHAR_REPORT_MULTIBYTE): New macro.
199 (readchar): New 2nd arg MULTIBYTE.
200 (read1): Use READCHAR_REPORT_MULTIBYTE for the first read. Make
201 symbol's name multibyte according to the multibyteness of the
204 2007-11-12 Kenichi Handa <handa@ni.aist.go.jp>
206 * xfaces.c (face_for_overlay_string): Call lookup_face with
207 correct arguments (fix of synching with the trunk).
209 2007-11-05 Kenichi Handa <handa@m17n.org>
211 * font.c (font_prop_validate_symbol): The argument prop_index is
213 (font_prop_validate_style, font_prop_validate_non_neg)
214 (font_prop_validate_spacing): Likewise.
215 (font_property_table): Arguments to validater changed. Callers
217 (font_lispy_object): Deleted.
218 (font_at): Use font_find_object instead fo font_lispy_object.
220 2007-11-02 Kenichi Handa <handa@ni.aist.go.jp>
222 * fileio.c (Fexpand_file_name): Adjust multibyteness of directory
225 2007-10-27 Jason Rumney <jasonr@gnu.org>
227 * w32font.c (add_font_name_to_list): Avoid vertical fonts.
228 (font_matches_spec): Remove debug output.
229 (add_font_entity_to_list): Avoid using substituted fonts.
231 2007-10-21 Jason Rumney <jasonr@gnu.org>
233 * doc.c (Fsnarf_documentation):
234 * Makefile.in (temacs${EXEEXT}, mostlyclean): Undo last change.
236 2007-10-12 Miles Bader <miles@gnu.org>
238 * src/dispextern.h (struct glyph_row): Only define "clip" field if
239 HAVE_WINDOW_SYSTEM is defined.
241 2007-10-12 Stefan Monnier <monnier@iro.umontreal.ca>
243 Fix up multi-tty merge.
245 * xterm.c (handle_one_xevent): Remove duplicate code and fix up nesting
248 * xfaces.c (free_realized_face, clear_face_gcs):
249 Include font_done_for_face in the input_blocked section, just in case.
251 * xdisp.c (decode_mode_spec): Use terminal-local coding systems.
252 (get_char_face_and_encoding): Undo last change and remove the *other*
253 duplicate definition (i.e. keep the one that's better scoped and that
254 includes code for the font-backend).
256 * terminal.c (create_terminal): Default keyboard_coding to
257 `no-conversion' and terminal_coding to `undecided'.
259 * lread.c (read1): Use XSETPVECTYPE to set a pseudovector's tag.
261 * fontset.c (free_realized_fontsets): Check that the table entry does
262 contain a fontset before trying to compare it to `base'.
264 * emacs.c (main): Move syms_of_data, syms_of_fileio, syms_of_alloc,
265 syms_of_charset, and syms_of_coding earlier because init_window_once
266 now needs Vcoding_system_hash_table to be setup.
268 * coding.h (default_buffer_file_coding): Remove.
270 * coding.c (default_buffer_file_coding): Remove.
271 (Fterminal_coding_system, Fkeyboard_coding_system): Use ->id rather
272 than ->symbol, and use the terminal-local coding system.
273 (syms_of_coding): Don't setup the coding-systems that are not
275 (Fdefine_coding_system_internal): Use XCAR/XCDR.
277 * chartab.c (Fmake_char_table, make_sub_char_table, copy_char_table):
278 Use XSETPVECTYPE now that XSETCHAR_TABLE doesn't set the tag anymore.
280 * alloc.c (Fmake_char_table, make_sub_char_table): Remove. They're now
281 in chartab.c and were re-added here by mistake.
282 (Fpurecopy): Use XSETPVECTYPE after copying a COMPILED pseudovector.
284 * doc.c (Fsnarf_documentation):
285 * Makefile.in (temacs${EXEEXT}, mostlyclean): Move buildobj.lst from
288 * ChangeLog.10: Add mistakenly removed entry.
290 2007-10-12 Dan Nicolaescu <dann@ics.uci.edu>
292 * Makefile.in (fringe.o, minibuf.o): Fix dependencies.
294 2007-10-11 Miles Bader <miles@gnu.org>
296 * xdisp.c (get_char_face_and_encoding): Remove extraneous definition.
297 Add extra args to FACE_FOR_CHAR.
299 2007-09-20 Kenichi Handa <handa@m17n.org>
301 * keymap.c (where_is_internal_1): If key is a cons, store the copy
304 * chartab.c (map_sub_char_table): If the range contains just one
305 character, call the function with that character even if the depth
307 (map_char_table): Likewise.
309 2007-09-19 Jason Rumney <jasonr@gnu.org>
311 * w32font.c (w32font_text_extents): Calculate metrics for the
314 2007-09-15 Jason Rumney <jasonr@gnu.org>
316 * w32xfns.c (get_next_msg): Consolidate WM_PAINT messages.
318 2007-09-13 Jason Rumney <jasonr@gnu.org>
320 * w32term.c (x_set_glyph_string_clipping): Use
321 get_glyph_string_clip_rects.
322 (x_set_glyph_string_clipping_exactly): Adjusted for the change of
324 (x_draw_glyph_string): Likewise.
326 * w32font.c (w32font_draw): Do clipping here.
328 2007-09-13 Kenichi Handa <handa@m17n.org>
330 * xftfont.c (xftfont_draw): Adjusted for the change of struct
333 * xterm.c (x_set_glyph_string_clipping): Use
334 get_glyph_string_clip_rects.
335 (x_set_glyph_string_clipping_exactly): Adjusted for the change of
337 (x_draw_glyph_string): Likewise.
339 * xdisp.c (get_glyph_string_clip_rects): Reflect s->row->clip to
340 the resulting clip(s}.
341 (expose_overlaps): Add arg r. Callers changed. Set it ot
342 row->clip temporarily.
343 (expose_window): Redraw rows overlapping the exposed area.
345 * dispextern.h (struct glyph_row): New member clip.
346 (struct glyph_string): Delete members clip_x, clip_y, clip_width,
347 clip_height, new member clip, and num_clips.
349 2007-09-07 Kenichi Handa <handa@m17n.org>
351 * data.c (Fchar_or_string_p): Fix docstring.
353 2007-08-22 Kenichi Handa <handa@m17n.org>
355 * xftfont.c (xftfont_draw): If s->font_info != s->face->font_info,
356 create a temporal XftDraw object.
358 2007-07-26 Kenichi Handa <handa@m17n.org>
360 * font.c (Ffontp): Fix docstring.
362 * coding.c (detect_coding_iso_2022): Don't treat SI/SO codes as a
363 strong evidence of ISO-2022.
365 2007-07-23 Kenichi Handa <handa@m17n.org>
367 * abbrev.c (abbrev_check_chars): Use CHAR_TABLE_REF, not
368 SYNTAX_ENTRY_FOLLOW_PARENT.
370 2007-06-29 Stefan Monnier <monnier@iro.umontreal.ca>
372 * fns.c (weak_hash_tables): Rename from Vweak_hash_tables and change
374 (make_hash_table, copy_hash_table, sweep_weak_hash_tables, init_fns):
375 Update to the new type of weak_hash_tables and next_weak.
377 * lisp.h (struct Lisp_Hash_Table): Change next_weak from Lisp_Object to
378 a plain C pointer to Lisp_Hash_Table.
380 * lisp.h (XGCTYPE, GC_HASH_TABLE_P, GC_NILP, GC_NUMBERP, GC_NATNUMP)
381 (GC_INTEGERP, GC_SYMBOLP, GC_MISCP, GC_VECTORLIKEP, GC_STRINGP)
382 (GC_CONSP, GC_FLOATP, GC_VECTORP, GC_OVERLAYP, GC_MARKERP)
383 (GC_INTFWDP, GC_BOOLFWDP, GC_OBJFWDP, GC_BUFFER_OBJFWDP)
384 (GC_BUFFER_LOCAL_VALUEP, GC_SOME_BUFFER_LOCAL_VALUEP)
385 (GC_KBOARD_OBJFWDP, GC_PSEUDOVECTORP, GC_WINDOW_CONFIGURATIONP)
386 (GC_PROCESSP, GC_WINDOWP, GC_SUBRP, GC_COMPILEDP, GC_BUFFERP)
387 (GC_SUB_CHAR_TABLE_P, GC_CHAR_TABLE_P, GC_BOOL_VECTOR_P, GC_FRAMEP)
388 (GC_EQ): Remove since they've been identical to their non-GC_
389 alter-egos ever since the markbit was eradicated.
408 * src/xterm.c: Replace uses of GC_* macros with the non-GC_ versions.
410 2007-06-25 Kenichi Handa <handa@m17n.org>
412 * chartab.c (map_sub_char_table): Make it work for the top-level
413 char-table. Fix handling of parent char-table.
414 (map_char_table): Adjust for the above change.
416 2007-06-24 Jason Rumney <jasonr@gnu.org>
418 * w32font.c (Qgdi): Rename from Qw32.
420 2007-06-22 Jason Rumney <jasonr@gnu.org>
422 * w32bdf.c (get_quoted_string): Make function static.
424 2007-06-20 Kenichi Handa <handa@m17n.org>
426 * xftfont.c (xftfont_open): If one of font's ASCII glyph has
427 bigger ascent and descent than those of the font, use them as
428 font's ascent and descent.
430 2007-06-18 Kenichi Handa <handa@m17n.org>
432 * Makefile.in (${lispsource}international/charprop.el): Move this
433 target within "#ifdef HAVE_UNIDATA" and "#endif".
435 2007-06-16 Kenichi Handa <handa@m17n.org>
437 * Makefile.in (lisp): Add ${lispsource}language/tai-viet.el.
438 (shortlisp): Add ../lisp/language/tai-viet.el.
440 2007-06-15 Ulrich Mueller <ulm@gentoo.org> (tiny change)
442 * Makefile.in (${lispsource}international/charprop.el): Depend on
445 2007-06-13 Jason Rumney <jasonr@gnu.org>
447 * w32font.c (w32font_close): Delete the GDI font object.
449 * w32menu.c: Include character.h
451 * w32proc.c: Likewise.
453 * w32select.c: Likewise.
455 * makefile.w32-in (w32proc.o): Depend on character.h
457 2007-06-11 Jason Rumney <jasonr@gnu.org>
459 * w32fns.c (syms_of_w32fns): Use DEFSYM macro.
461 * w32menu.c (syms_of_w32menu): Likewise.
463 * w32proc.c (syms_of_ntproc): Likewise.
465 * w32select.c (syms_of_w32select): Likewise.
467 * w32term.c (syms_of_w32term): Likewise.
469 2007-06-06 Jason Rumney <jasonr@gnu.org>
471 * w32font.c (w32font_draw): Delete brush after using it.
473 2007-06-04 Jason Rumney <jasonr@gnu.org>
475 * w32font.c (w32font_open): Don't set font_idx.
476 (w32font_text_extents): Try GetTextExtentPoint32W before defaulting
478 (w32font_draw): Fill background explicitly.
480 2007-06-03 Jason Rumney <jasonr@gnu.org>
482 * w32term.c (w32_initialize): Don't call w32font_initialize.
484 * w32font.c (w32font_info): Remove subranges.
485 (QCsubranges, Qmodern, Qswiss, Qroman): Remove.
486 (QCfamily, Qmonospace, Qsans_serif, Qmono, Qsans, Qsans__serif)
487 (Qraster, Qoutline, Qlatin, Qgreek, Qcoptic, Qcyrillic, Qarmenian)
488 (Qhebrew, Qarabic, Qsyriac, Qnko, Qthaana, Qdevanagari, Qbengali)
489 (Qgurmukhi, Qgujarati, Qoriya, Qtamil, Qtelugu, Qkannada)
490 (Qmalayalam, Qsinhala, Qthai, Qlao, Qtibetan, Qmyanmar, Qgeorgian)
491 (Qhangul, Qethiopic, Qcherokee, Qcanadian_aboriginal, Qogham)
492 (Qrunic, Qkhmer, Qmongolian, Qsymbol, Qbraille, Qhan)
493 (Qideographic_description, Qcjk_misc, Qkana, Qbopomofo, Qkanbun)
494 (Qyi, Qbyzantine_musical_symbol, Qmusical_symbol, Qmathematical):
496 (font_callback_data): New struct.
497 (w32font_list, w32font_match): Use it.
498 (w32font_open): Don't populate subranges.
499 (w32font_has_char): Use script Lisp symbols, not subrange bitmask.
500 (w32font_encode_char): Always return unicode code-point as-is.
501 (w32font_text_extents): Supply a tranformation matrix to
502 GetGlyphOutline. Never look up by glyph index. Avoid looping
503 twice. Use unicode version of GetTexExtentPoint32 instead of
505 (set_fonts_frame): Remove
506 (w32_enumfont_pattern_entity): Add frame parameter, use it to
507 set frame parameter. Use backward compatible fake foundries.
508 Save generic family in extra slot under QCfamily. Make width slot
509 constant. Save QCspacing value. Save list of scripts instead of
511 (w32_generic_family, logfonts_match, font_matches_spec): New functions.
512 (add_font_entity_to_list): Use font_callback_data struct. Filter
514 (add_one_font_entity_to_list): Use font_callback_data struct.
515 (w32_registry): Default to iso10646_1;
516 (fill_in_logfont): Use dpi from extra slot. Don't bother with
517 string font registries. Don't fill in font name if it is a generic
518 family name, fill family instead. Use spacing, family and script
519 extra info to fill pitch, family and charset fields.
520 (list_all_matching_fonts): Use font_callback_data struct.
521 (unicode_range_for_char): Remove.
522 (font_supported_scripts): New function.
523 (w32font_initialize): Remove.
524 (syms_of_w32font): Update which symbols are defined.
526 2007-06-02 Jason Rumney <jasonr@gnu.org>
528 * font.c (font_pixel_size): Reverse assq_no_quit args.
530 * w32term.h (FONT_WIDTH): Report max width, not average.
531 (FONT_MAX_WIDTH): Remove.
532 (FONT_AVG_WIDTH): New macro.
534 * xfaces.c (Fx_list_fonts) [WINDOWSNT]: Remove Windows only
535 redefinition of FONT_WIDTH.
537 * w32term.c (x_font_min_bounds): Use FONT_AVG_WIDTH.
538 (w32_cache_char_metrics): Use FONT_WIDTH.
540 * w32fns.c (w32_load_system_font, w32_list_fonts): Use FONT_AVG_WIDTH.
542 2007-06-01 Jason Rumney <jasonr@gnu.org>
544 * w32font.c (w32font_open): Make lfHeight negative.
546 * w32fns.c (x_default_font_parameter): Use new style font name.
547 (Fx_create_frame, x_create_tip_frame): Initialize resx and resy.
549 2007-05-31 Jason Rumney <jasonr@gnu.org>
551 * w32font.c (QCsubranges): New symbol.
552 (w32font_open, w32font_has_char): Get subranges from subproperty
554 (w32_enumfont_pattern_entity): Set subranges as subproperty of extra.
555 (syms_of_w32font): Define :subranges symbol.
557 * font.c (font_put_extra): Expose externally.
559 * font.h (font_put_extra): Moved declaration from font.c.
561 * font.c (Ffont_get): Use font driver to determine otf capability.
562 (adjust_anchor): Check if driver defines anchor_point before using.
564 * w32font.c (w32font_open): Handle size, height and pixel_size better.
565 (w32font_draw): Use options.
566 (w32_enumfont_pattern_entity): Set size to 0 for scalable fonts.
567 Fix detection of truetype fonts.
568 (registry_to_w32_charset): Handle charsets other than iso8859-1
569 expressed as lisp symbols.
570 (w32_registry): Express charset as lisp symbol.
571 (fill_in_logfont): Reverse pixel and point height logic.
572 Don't set width here. Set quality to default.
574 * w32fns.c (w32_load_system_font): Fix detecting FIXED_PITCH fonts.
575 (x_to_w32_font): Fill in lfPitchAndFamily correctly.
577 * xterm.c (x_draw_glyph_string_foreground) [USE_FONT_BACKEND]:
578 Remove redundant loop and allocation.
580 * makefile.w32-in (font.o, w32font.o): New objects.
581 (fontset.o, xdisp.o, xfaces.o, w32fns.o, w32term.o): Depend on font.h
582 (FONTOBJ): New group of objects conditioned on USE_FONT_BACKEND.
584 * xdisp.c (fill_composite_glyph_string): Make the first arg to
585 STORE_XCHARB a valid l-value.
587 * w32term.c (w32_native_per_char_metric): Swap width and rbearing
588 calculations for non-Truetype fonts.
589 (x_draw_glyph_string): Sync with xterm.c.
590 (x_draw_glyph_string_foreground) [USE_FONT_BACKEND]: Remove
592 (w32_initialize) [USE_FONT_BACKEND]: Call w32font_initialize.
594 * w32term.h (w32_output_data) [USE_FONT_BACKEND]: Add fontp member.
595 (FRAME_FONT_OBJECT) [USE_FONT_BACKEND]: New macro from xterm.h.
597 * w32fns.c [USE_FONT_BACKEND]: Port font backend changes from xfns.c.
598 (x_to_w32_charset, w32_to_x_charset): Expose externally.
600 * w32font.c: New file for w32 font backend.
602 2007-05-28 Kenichi Handa <handa@m17n.org>
604 * term.c: Don't include "buffer.h" twice.
606 2007-05-21 Kenichi Handa <handa@m17n.org>
608 * syntax.c (skip_syntaxes): Synch with the trunk.
610 2007-05-14 Kenichi Handa <handa@m17n.org>
612 * character.c (Funibyte_string): New function.
613 (syms_of_character): Defsubr it.
615 2007-05-01 Jason Rumney <jasonr@gnu.org>
617 * w32term.c [USE_FONT_BACKEND]:
618 (x_get_font_repertory, note_mouse_movement, x_set_mouse_face_gc):
619 (x_set_glyph_string_clipping, x_set_glyph_string_clipping_exactly):
620 (x_draw_glyph_string, x_draw_glyph_string_foreground):
621 (x_draw_composite_glyph_string_foreground, x_new_fontset2):
622 (x_free_frame_resources): Sync with xterm.c.
624 2007-04-29 Andreas Schwab <schwab@suse.de>
626 * lread.c (read1): Use CHAR_TABLE_STANDARD_SLOTS to validate
629 2007-04-26 Kenichi Handa <handa@m17n.org>
631 * font.c (check_otf_features): Define it regardless of
634 2007-04-25 Kenichi Handa <handa@m17n.org>
636 * ftfont.c (ftfont_driver): Delete font_otf_gsub and
637 font_otf_gpos, add font_drive_otf.
639 * fontset.c (fontset_find_font): Pay attention to font size
640 specified for a font.
641 (reorder_font_vector): Check contents of font_def.
643 * font.c (struct otf_list): Delete it.
644 (otf_list): Make it a lisp variable..
645 (otf_open): Use lispy otf_list.
646 (generate_otf_features): Renamed from parse_gsub_gpos_spec.
647 (check_otf_features): New function.
648 (font_otf_DeviceTable, font_otf_ValueRecord, font_otf_Anchor): New
650 (font_drive_otf): New function merging font_otf_gsub and
652 (font_open_for_lface): New arg spec. Change argument order.
653 (font_load_for_face): Adjusted for the change of
655 (Ffont_drive_otf): New function merging Ffont_otf_gsub and
657 (syms_of_font): Staticpro otf_list. Delete defsubr of
658 Sfont_otf_gsub and Sfont_otf_gpos. Defsubr Sfont_drive_otf.
660 * xfaces.c (set_font_frame_param): Adjusted for the change of
663 * font.h (font_open_for_lface): Adjust prototype.
664 (struct font_driver): Delete members otf_gsub and otf_gpos, add
666 (font_otf_gsub, font_otf_gpos): Delete externs.
667 (font_drive_otf): Extern it.
669 2007-04-24 Kenichi Handa <handa@m17n.org>
671 * font.c (font_at): If the window W is not on a window system,
674 * coding.c (produce_chars): Don't call insert_from_gap if no
675 characters to produce.
676 (encode_coding): Likewise.
678 2007-04-17 Kenichi Handa <handa@m17n.org>
680 * fontset.c (free_realized_fontsets): Avoid unnecessary call of
683 * xfaces.c (face_for_font): Check also face->font==font->font.font.
685 2007-04-16 Miles Bader <miles@gnu.org>
687 * emacs.c (main): Change default value of `enable_font_backend' to 1.
688 Parse "--disable-font-backend" option.
689 (standard_args): Add "--disable-font-backend" option.
691 2007-04-13 Kenichi Handa <handa@m17n.org>
693 * fontset.c (fontset_find_font): New function.
694 (fontset_font): Use fontset_find_font.
695 (make_fontset_for_ascii_face): Don't set face ID in rfont_def.
696 Register the specified font for all Latin characters.
697 (new_fontset_from_font): Register the specified font for all Latin
699 (dump_fontset): For a realized fontset, include the base fontset
700 name in the returned vector.
702 2007-04-11 Kenichi Handa <handa@m17n.org>
704 * character.h (CHAR_STRING): Cast C to unsigned on calling
707 * character.c (char_string): Type of arg C changed to unsigned.
708 Signal an error if C is an invalid character code.
710 * editfns.c (general_insert_function): Use CHARACTERP, not INTEGERP.
711 (Fchar_to_string): Likewise.
713 2007-03-23 Kenichi Handa <handa@m17n.org>
715 * character.h (MIN_MULTIBYTE_LEADING_CODE)
716 (MAX_MULTIBYTE_LEADING_CODE): New macros.
718 * regex.c (analyse_first): Fix for multibyte characters in "case
719 charset:" and "case categoryspec:".
721 2007-03-04 Andreas Schwab <schwab@suse.de>
723 * Makefile.in (LIBES): Move standard libraries to the end.
725 2007-02-27 Kenichi Handa <handa@m17n.org>
727 * process.c: Cancel the change done by sync with HEAD.
729 2007-02-23 Kenichi Handa <handa@m17n.org>
731 * alloc.c (Fgarbage_collect): If nextb->text->inhibit_shrinking is
732 nonzero, don't shrink the buffer nextb.
734 * buffer.h (struct buffer_text): New member inhibit_shrinking.
736 * coding.c (coding_alloc_by_making_gap): New arg offset.
737 (alloc_destination): Call coding_alloc_by_making_gap with the arg
739 (decode_coding_iso_2022): Update coding->safe_charsets.
740 (decode_coding_gap): Temporarily set
741 current_buffer->text->inhibit_shrinking to 1.
743 2007-02-20 Kenichi Handa <handa@m17n.org>
745 * xterm.c (x_draw_composite_glyph_string_foreground): Fix
746 indexing into elements of s->cmp and s->char2b.
748 2007-02-16 Juanma Barranquero <lekktu@gmail.com>
750 * regex.c (RE_STRING_CHAR_AND_LENGTH) [! emacs]: Add missing arg `len'.
752 2007-02-16 Kenichi Handa <handa@m17n.org>
754 * regex.c (GET_CHAR_BEFORE_2, GET_CHAR_AFTER): Check the variable
755 target_multibyte instead of multibyte.
756 (re_match_2_internal): Call bcmp_translate with target_multibyte.
757 (bcmp_translate): Change the argument name from multibyte to
760 2007-02-15 Kenichi Handa <handa@m17n.org>
762 These changes are to compile a regexp into a pattern that can be
763 used both for multibyte and unibyte targets.
765 * Makefile.in (search.o): Depend on charset.h.
767 * character.c (multibyte_char_to_unibyte_safe): New function.
769 * search.c: Include "charset.h".
770 (compile_pattern_1): Delete argument multibyte. Don't set
771 cp->buf.target_multibyte here. Set cp->buf.charset_unibyte.
772 (compile_pattern): Don't compare cp->buf.target_multibyte.
773 Compare cp->buf.charset_unibyte.
774 (compile_pattern): Set cp->buf.target_multibyte.
776 * lisp.h (multibyte_char_to_unibyte_safe): Extern it.
778 * regex.h (struct re_pattern_buffer): New member charset_unibyte.
780 * regex.c (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
781 multibyte. Callers changed.
782 (RE_CHAR_TO_MULTIBYTE, RE_CHAR_TO_UNIBYTE): New macros.
783 (MAKE_CHAR_MULTIBYTE, MAKE_CHAR_UNIBYTE): Deleted. Callers
784 changed to use RE_CHAR_TO_MULTIBYTE and RE_CHAR_TO_UNIBYTE
786 (SETUP_ASCII_RANGE, SETUP_UNIBYTE_RANGE): New macros.
787 (SETUP_MULTIBYTE_RANGE): Generate a more compact range_table.
788 (regex_compile): Make the compiled pattern usable both for
789 multibyte and unibyte targets.
790 (analyse_first): Make the fastmap usable both for multibyte and
792 (TRANSLATE_VIA_MULTIBYTE): Deleted.
793 (re_match_2_internal): Pay attention to the case that the
794 multibyteness of bufp and target may be different.
796 2007-02-14 Kenichi Handa <handa@m17n.org>
798 * xdisp.c (x_produce_glyphs): When a font is not found, make the
799 empty box occupy at least one column width.
801 2007-01-30 Miles Bader <miles@gnu.org>
803 * Makefile.in: Remove redundant HAVE_XFT clause.
805 2006-12-20 Kenichi Handa <handa@m17n.org>
807 * xrdb.c (x_load_resources): Setup the default fontSet X reource.
809 2006-12-15 Kenichi Handa <handa@m17n.org>
811 * regex.c (regex_compile): Synch with HEAD.
813 2006-12-12 Kenichi Handa <handa@m17n.org>
815 * fontset.c (Finternal_char_font): Fix previous change.
817 2006-12-07 Kenichi Handa <handa@m17n.org>
819 * fontset.c (Finternal_char_font): Fix for the case of POSITION
822 2006-12-06 Kenichi Handa <handa@m17n.org>
824 * xftfont.c (xftfont_open): Call FcConfigSubstitute.
826 2006-12-05 Kenichi Handa <handa@m17n.org>
828 * xftfont.c (xftfont_open): Don't enable antialias explicitly.
830 2006-11-30 Kenichi Handa <handa@m17n.org>
832 * search.c (simple_search): Fix previous change.
834 2006-11-29 Kenichi Handa <handa@m17n.org>
836 * xftfont.c (ftfont_font_format): Extern declaration.
838 * frame.c (x_set_font): Fix the second arg to fs_query_fontset.
840 * xfont.c (xfont_driver): Initialize ftfont_driver.type by 0.
841 (xfont_list): Don't directly use Lisp_Object as an operand of &&.
843 * ftfont.c (ftfont_driver): Initialize ftfont_driver.type by 0.
844 (ftfont_font_format): Fix previous change.
846 * font.h (Ffont_xlfd_name): EXFUN it.
848 * font.c (font_parse_xlfd): Fix the array size of `f'.
849 (register_font_driver): Use EQ to compare driver->type.
851 * xfns.c (xic_create_xfontset2) [USE_FONT_BACKEND]: New function.
852 (create_frame_xic) [USE_FONT_BACKEND]: Call xic_create_xfontset2.
853 (xic_set_xfontset) [USE_FONT_BACKEND]: Likewise.
855 2006-11-27 Kenichi Handa <handa@m17n.org>
857 * ftfont.c (ftfont_pattern_entity): Check if FC_FONTFORMAT is
859 (ftfont_list_generic_family, ftfont_list, ftfont_font_format):
862 2006-11-24 Kenichi Handa <handa@m17n.org>
864 * xfont.c (xfont_open): Set font->format.
866 * xftfont.c (xftfont_open): Set font->format.
868 * ftfont.c (ftfont_pattern_entity): Add fontformat in a pattern.
869 (ftfont_list): Include FC_FONTFORMAT in FcObject.
870 (ftfont_open): Set font->format.
871 (ftfont_font_format): New function.
873 * font.h (struct font): New memeber format.
875 * font.c (Qopentype): New variable.
876 (syms_of_font): Defsym it.
877 (Fquery_font): Change the format of the last element of the return
880 2006-11-22 Kenichi Handa <handa@m17n.org>
882 * search.c (simple_search): Fix sync with HEAD.
884 2006-11-17 Kenichi Handa <handa@m17n.org>
886 * xfns.c (xic_create_xfontset): Try the default fontset name as a
889 2006-11-08 Kenichi Handa <handa@m17n.org>
891 * coding.c (detect_coding_charset): Fix detection of multi-byte
894 2006-11-07 Bob Halley <halley@play-bow.org> (tiny change)
896 * ccl.c (ccl_driver): If DST is NULL, set ccl->produced to 0.
898 2006-10-31 Kenichi Handa <handa@m17n.org>
900 * xdisp.c (get_next_display_element): Set it->face_id for the
901 first component of a composition.
902 (x_produce_glyphs): Check if the font is changed or not for
905 2006-10-31 Kenichi Handa <handa@m17n.org>
907 (get_next_display_element): Set it->face_id for the
908 first component of a composition.
909 (x_produce_glyphs): Check if the font is changed or not for
912 2006-10-30 Kenichi Handa <handa@m17n.org>
914 * fontset.c (Qlatin): New variable.
915 (syms_of_fontset): Define it as a lisp symbol.
916 (Fset_fontset_font): If TARGET is `latin', use FONT_SPEC for
919 2006-10-27 Kenichi Handa <handa@m17n.org>
921 * font.c (font_unparse_fcname): Pay attention to the case that
922 some of font property is a null string.
924 2006-10-26 Kenichi Handa <handa@m17n.org>
926 * term.c: Include "composite.h".
927 (encode_terminal_code): Output all components of composition.
928 Check the size of encode_terminal_src.
929 (produce_glyphs): For compostion, call produce_composite_glyph.
930 (append_composite_glyph, produce_composite_glyph): New functions.
932 * xdisp.c (x_produce_glyphs): In handling composition, if a font
933 is not found, get font_info from the current ascii face.
935 2006-10-23 Kenichi Handa <handa@m17n.org>
937 * fileio.c (Finsert_file_contents): On replacing, temporarily bind
938 buffer-file-name to Qnil before calling insert_from_buffer.
940 * font.c (font_unparse_fcname): Pay attention to the case that
941 foundry is a null string.
943 2006-10-17 Kenichi Handa <handa@m17n.org>
945 * ftfont.c (ftfont_list): Allow registry "unicode-sip".
947 * font.c (Qunicode_sip): New variable.
948 (syms_of_font): Declare it as a Lisp symbol.
950 * font.h (Qunicode_sip): Extern it.
952 2006-10-16 Kenichi Handa <handa@m17n.org>
954 * composite.c (get_composition_id): Pay attention to TAB
957 * xterm.c (x_draw_composite_glyph_string_foreground): Don't draw
958 TAB. Adjusted for the change of s->char2b which always points to
959 the first elememnt of allocated memory.
961 * xftfont.c (xftfont_text_extents): Fix calculation of descent
964 * xdisp.c (handle_composition_prop): Set it->c to the first
966 (fill_composite_glyph_string): Argument changed.
967 (BUILD_COMPOSITE_GLYPH_STRING): Adjusted for the above change.
968 (x_produce_glyphs): Fix handling of left/right padding.
970 2006-10-04 Kenichi Handa <handa@m17n.org>
972 * regex.c (analyse_first): Cancel the change for synching with
975 2006-08-28 Kenichi Handa <handa@m17n.org>
977 * coding.c (detect_coding_system): Fix for handling off
978 inhibit_iso_escape_detection. Fix for the case that no coding
979 system is defined for a specific coding category.
981 2006-08-21 Kenichi Handa <handa@m17n.org>
983 * font.c (font_matching_entity): Dolete unused local var.
985 * xftfont.c (xftfont_open): Call XftDefaultSubstitute before
988 * fileio.c (Finsert_file_contents): On recovering a file, assume
990 (choose_write_coding_system): On auto-saving a file, force
993 * coding.c (setup_coding_system): Fix setting of
994 coding->common_flags based on eol_type.
995 (coding_inherit_eol_type): If PARENT is not nil, be sure to
998 2006-08-04 Kenichi Handa <handa@m17n.org>
1000 * alloc.c (NSTATICS): Increased to 0x600.
1002 2006-08-01 Kenichi Handa <handa@m17n.org>
1004 * ftfont.c (ftfont_driver): Set ftfont_driver.match to
1006 (ftfont_list): Don't check :name property.
1007 (ftfont_match): New function.
1008 (ftfont_pattern_entity): If the pattern doesn't contain
1009 FC_SPACING, don't assuce FC_MONO.
1011 * font.h (struct font_driver): New member `match'.
1012 (font_update_drivers): Prototype adjusted.
1014 * font.c (font_parse_fcname): Don't change :name property of FONT.
1015 (font_parse_name): Likewise.
1016 (LGSTRING_HEADER_SIZE, LGSTRING_GLYPH_SIZE, check_gstring): Define
1017 them unconditionally.
1018 (font_matching_entity): New function.
1019 (font_open_by_name): Try font_matching_entity if exact match is
1021 (font_update_drivers): Delete the arg FONT. Return a list of
1022 actually used backends. Don't free faces, font caches here.
1023 Don't store data in frame parameters. Don't call x_set_font.
1024 (Ffont_spec): Store :name property as is.
1025 (Ffont_get): Check HAVE_LIBOTF before calling font_otf_capability.
1026 (Ffont_otf_gsub): Call font->driver->otf_gsub instead of
1028 (Ffont_otf_gpos): Call font->driver->otf_gpos instead of
1030 (Ffont_otf_alternates): Check if the driver has otf_gsub function.
1031 Call font->driver->otf_gsub instead of font_otf_gsub.
1033 * frame.c (x_set_font_backend): Do more works that were done in
1034 font_update_drivers before.
1036 * xfont.c (xfont_match): New function.
1037 (xfont_driver): Set xfont_driver.match to xfont_match.
1038 (xfont_draw): Set font in GC if necessary.
1040 * ftxfont.c (ftxfont_match): New function.
1041 (syms_of_ftxfont): Set ftxfont_driver.match to ftxfont_match.
1043 * xftfont.c (xftfont_match): New function.
1044 (syms_of_xftfont): Set xftfont_driver.match to xftfont_match.
1046 2006-07-28 Kenichi Handa <handa@m17n.org>
1048 * font.h (struct font): New member scalable.
1049 (struct font_driver): New arg ALTERANTE_SUBST to otf_gsub.
1050 (font_otf_gsub): Prototype adjusted.
1052 * font.c (font_otf_capability): Fix handling of the default
1054 (parse_gsub_gpos_spec): Type changed to void. New arg nbytes.
1055 Check the contents of SPEC.
1056 (LGSTRING_HEADER_SIZE, LGSTRING_GLYPH_SIZE): New macros.
1057 (check_gstring): New function.
1058 (REPLACEMENT_CHARACTER): New macro.
1059 (font_otf_gsub): New arg alternate_subst. Be sure to set all
1060 glyph codes of GSTRING.
1061 (font_otf_gpos): Be sure to set all glyph codes of GSTRING.
1062 (font_prepare_composition): Set cmp->glyph_len.
1063 (font_open_entity): Set font->scalable.
1064 (Ffont_get): Handle :otf property.
1065 (Ffont_otf_gsub, Ffont_otf_gpos, Ffont_otf_alternates): New
1067 (Fquery_font): Use font->font.full_name.
1068 (syms_of_font): Defsubr Sfont_otf_gsub, Sfont_otf_gpos, and
1069 Sfont_otf_alternates.
1071 * ftfont.c (ftfont_open): Set font->font.full_name and
1072 font->font.name properly. Fix calculation of font->font.height
1073 and font->min_width.
1075 * ftxfont.c (ftxfont_create_gcs): New function.
1076 (ftxfont_draw_bitmap): Fix arg to ftfont_driver.get_bitmap.
1077 (ftxfont_draw_backgrond): Fix filling region.
1078 (ftxfont_default_fid): New function.
1079 (ftxfont_open): Set xfotn->fid to the return value of
1080 ftxfont_default_fid.
1081 (ftxfont_prepare_face): Use ftxfont_create_gcs to create GCs.
1082 (ftxfont_done_face): Free only GCs that are created by
1084 (ftxfont_draw): If face->gc != s->gc, create proper GCs.
1086 * xterm.c (x_set_glyph_string_clipping_exactly) [USE_FONT_BACKEND]:
1087 Clip to src->width, etc (not src->clip_XXX).
1089 * xfns.c (x_create_tip_frame) [USE_FONT_BACKEND]: Handle
1090 FontBackend frame parameter.
1092 2006-07-26 Kenichi Handa <handa@m17n.org>
1094 * font.h (struct font_driver_list): New member `on'.
1095 (Fclear_font_cache): EXFUN it.
1096 (font_update_drivers): Extern it.
1098 * font.c (font_unparse_fcname): Fix typo (swidth->width).
1099 (font_list_entities): Check driver_list->on.
1100 (register_font_driver): Initalize `on' member to 0.
1101 (font_update_drivers): New function.
1102 (Fclear_font_cache): Check driver_list->on.
1104 * frame.h (Qfont_backend): Extern it.
1105 (x_set_font_backend): Extern it.
1107 * frame.c (Qfont_backend): New variable.
1108 (frame_parms): New element for font-backend.
1109 (x_set_font_backend): New function.
1111 * xfns.c (Fx_create_frame) [USE_FONT_BACKEND]: Handle
1112 FontBackend frame parameter.
1113 (x_frame_parm_handlers) [USE_FONT_BACKEND]: New element
1116 * xfont.c (xfont_list): Don't try listing by :name property if the
1117 name is not for XLFD.
1119 2006-07-24 Kenichi Handa <handa@m17n.org>
1121 * font.h (LGLYPH_FROM, LGLYPH_TO, LGLYPH_SET_FROM)
1122 (LGLYPH_SET_TO): New macros.
1123 (LGLYPH_XOFF, LGLYPH_YOFF, LGLYPH_WADJUST): Check if adjustment
1124 element of G is vector or not.
1125 (font_at): Extern it.
1127 * font.c: Include window.h.
1128 (font_lispy_object): New function.
1129 (font_prepare_composition): Check LGLYPH_FORM (g) to detect the
1131 (font_close_object): Fix getting (struct font *).
1132 (font_at): New function.
1133 (Ffont_get): If FONT is a font-object, get entity from it.
1134 (Ffont_make_gstring): Initialize elements of glyphs with nil.
1135 (Ffont_fill_gstring): Use macro LGSTRING_XXX and LGLYPH_XXX. Fix
1137 (Ffont_at): New function.
1138 (syms_of_font): Defsubr Sfont_at.
1140 * xdisp.c (it_props): Move the entry for Qauto_composed to just
1141 before the entry for Qcompostion.
1142 (handle_auto_composed_prop): Call auto-composition-function with 4
1144 (handle_composition_prop) [USE_FONT_BACKEND]: Set it->face_id from
1145 the font in gstring.
1146 (fill_composite_glyph_string) [USE_FONT_BACKEND]: Check
1147 LGLYPH_FORM (g) to detect the end of valid glyph.
1148 (x_produce_glyphs) [USE_FONT_BACKEND]: Don't update it->face_id if
1149 we are composing with gstring.
1151 * xterm.c (x_draw_composite_glyph_string_foreground) [USE_FONT_BACKEND]:
1152 Check if adjustment is vector or not.
1154 * Makefile.in (font.o): Make it depends on window.h.
1156 2006-07-24 Kenichi Handa <handa@m17n.org>
1158 * xterm.c (x_draw_composite_glyph_string_foreground): Check if
1159 adjustment is vector or not.
1161 2006-07-20 Kenichi Handa <handa@m17n.org>
1163 * casefiddle.c (casify_object): Sync with HEAD.
1165 2006-07-18 Miles Bader <miles@gnu.org>
1167 * character.h (CHECK_CHARACTER): Redefine in terms of CHECK_TYPE.
1169 2006-07-14 Kenichi Handa <handa@m17n.org>
1171 * font.h (LGLYPH_XOFF, LGLYPH_YOFF, LGLYPH_WIDTH, LGLYPH_WADJUST)
1172 (LGLYPH_SET_WIDTH): Adjusted for the change of LGLYPH format.
1173 (LGLYPH_ADJUSTMENT, LGLYPH_SET_ADJUSTMENT): New macros.
1175 * font.c (font_merge_old_spec): Treat '*' in foundry as a wild
1177 (DEVICE_DELTA): Fix typo.
1178 (font_otf_gpos): Adjusted for the change of LGLYPH format.
1179 (font_prepare_composition): Likewise.
1181 * xterm.c (x_draw_composite_glyph_string_foreground): Adjusted for
1182 the change of LGLYPH format.
1184 2006-07-07 Kenichi Handa <handa@m17n.org>
1186 * ftfont.c (ftfont_list): Fix typo.
1187 (ftfont_build_basic_charsets): Don't include letters with
1190 2006-07-09 Jan Dj
\e,Ad
\e(Brv <jan.h.d@swipnet.se>
1192 * xfaces.c (realize_non_ascii_face): Set face->extra to NULL.
1194 * xftfont.c (xftfont_done_face): Call XftDrawDestroy only if
1195 xftface_info is non-NULL.
1197 2006-07-07 Kenichi Handa <handa@m17n.org>
1199 * ftfont.c (ftfont_list): Fix typo.
1200 (ftfont_build_basic_charsets): Don't include letters with
1203 2006-07-05 Jan Dj
\e,Ad
\e(Brv <jan.h.d@swipnet.se>
1205 * ftfont.c (ftfont_list): Move misplaced #endif
1207 2006-07-05 Kenichi Handa <handa@m17n.org>
1209 * ftfont.c (ftfont_list): Pay attention to the case that
1210 FC_CAPABILITY is not defined.
1212 2006-07-03 Kenichi Handa <handa@m17n.org>
1214 * xftfont.c (xftfont_open): Set charset related members to -1.
1216 * ftfont.c (ftfont_list): Handle QCotf property. Handling of
1218 (ftfont_open): Set charset related members to -1.
1220 * fontset.c (Votf_script_alist): New variable.
1221 (syms_of_fontset): Initialize it.
1222 (fontset_font): Delete unused variable.
1224 * fontset.h (Votf_script_alist): Extern it.
1226 * font.c (font_find_for_lface): Code optimized.
1228 * font.h (font_close_object, font_merge_old_spec): Extern them.
1230 2006-06-28 Kenichi Handa <handa@m17n.org>
1232 * font.c (QCscalable, Qc, Qm, Qp, Qd): New variables.
1233 (syms_of_font): Initialize them.
1234 (font_pixel_size): Allow float value in dpi.
1235 (font_prop_validate_type): Deleted.
1236 (font_prop_validate_symbol, font_prop_validate_style): Argument
1237 changed. Caller changed.
1238 (font_prop_validate_non_neg): Renamed from
1239 font_prop_validate_size.
1240 (font_prop_validate_extra): Deleted.
1241 (font_prop_validate_spacing): New function.
1242 (font_property_table): Add elements for all known properties.
1243 (get_font_prop_index): Renamed from check_font_prop_name. New
1244 argument FROM. Caller changed.
1245 (font_prop_validate): Validate all known properties.
1246 (font_put_extra): Argument force deleted. Caller changed.
1247 (font_expand_wildcards): Make it static. Fix the way of shrinking
1249 (font_parse_xlfd): Arguemnt merge deleted. Fix handling of RESX,
1250 RESY, SPACING, and AVGWIDTH. Don't validate property values here.
1252 (font_unparse_xlfd): Handle dpi, spacing, and scalable properties.
1253 (font_parse_fcname): Arguemnt merge deleted. Fix parsing of point
1254 size. Don't validate properties values here. Caller changed.
1255 (font_unparse_fcname): Handle dpi, spacing, and scalable
1257 (font_open_by_name): Delete unused variable.
1258 (Ffont_spec): Likewise. Validate property values.
1259 (Ffont_match_p): New function.
1261 * font.h (QCscalable): Extern it.
1262 (font_parse_xlfd, font_parse_fcname): Prototype adjusted.
1264 * ftfont.c (ftfont_list): Handle properties dpi, spacing, and
1267 * xfont.c (xfont_query_font): Adjusted for the change of
1269 (xfont_list_pattern): New function.
1270 (xfont_list): Use xfont_list_pattern.
1272 * xftfont.c (xftfont_prepare_face): Cancel previous change.
1273 (xftfont_done_face): Likewise.
1275 2006-06-26 Kenichi Handa <handa@m17n.org>
1277 * font.h (Flist_fonts): EXFUN it.
1279 2006-06-25 Jason Rumney <jasonr@gnu.org>
1281 * w32term.c (w32_initialize): Add back smoothing_type and
1282 smoothing_enabled definitions.
1284 2006-06-23 Kenichi Handa <handa@m17n.org>
1286 * xterm.c (x_draw_glyph_string) [USE_FONT_BACKEND]: Check
1287 s->face->font on determining underline position.
1289 2006-06-21 Kenichi Handa <handa@m17n.org>
1291 * font.c (font_parse_xlfd): Fix generating of CHARSET_REGISTRY field.
1292 (font_has_char): Accept font-object too.
1293 (font_find_for_lface): Try at first with a size specified in face.
1295 * xftfont.c (xftfont_prepare_face): Make non-ascii face share
1296 face->extra with ascii face.
1297 (xftfont_done_face): Don't free face->extra of non-ascii face.
1299 2006-06-20 Kenichi Handa <handa@m17n.org>
1301 * frame.c (x_set_font) [USE_FONT_BACKEND]: Fix argument to
1304 2006-06-19 Kenichi Handa <handa@m17n.org>
1306 * font.h (QCspacing, QCdpi): Extern them.
1307 (enum font_spacing): New enum.
1308 (FONT_PIXEL_SIZE_QUANTUM): New macro.
1310 * font.c (POINT_TO_PIXEL): Don't divice POINT by 10.
1311 (QCspacing, QCdpi): New variables.
1312 (syms_of_font): Initialize them.
1313 (font_pixel_size): New function.
1314 (font_put_extra): New function.
1315 (font_parse_xlfd): Fix handling of font size. Add QCdpi property
1317 (font_parse_fcname): Handle enumenrated values (e.g. bold). Fix
1318 handling font size. Add QCname property that contains only
1320 (font_score): Change argument. Caller changed. Pay attention to
1321 FONT_PIXEL_SIZE_QUANTUM.
1322 (font_sort_entites): Fix handling of font size.
1323 (font_list_entities): Likewise.
1324 (font_find_for_lface): Likewise.
1325 (font_open_for_lface): Likewise.
1326 (font_open_by_name): Likewise.
1327 (Ffont_spec): Add QCname property that contains only unknown
1330 * ftfont.c (ftfont_list): Use assq_no_quit, not Fassq. Don't
1331 include weight in listing pattern, instead check weight of each
1332 listed font. Don't include scalable in pattern. Pay attention to
1333 FONT_PIXEL_SIZE_QUANTUM.
1335 2006-06-19 Kenichi Handa <handa@m17n.org>
1337 * lread.c (read_escape): Fix the code synched with HEAD.
1339 * font.c (font_parse_fcname): Fix parsing of point-size.
1340 (font_unparse_fcname): Produce symbolic names for style
1342 (font_list_entities): Handle float size correctly.
1343 (font_open_by_name): Prefer `normal' property values if the name
1344 doesn't specify them.
1346 * fontset.c (Finternal_char_font): Use font_get_name, not
1349 * ftfont.c (ftfont_pattern_entity): Use the numeric value 100 for
1350 FC_WEIGHT_REGULAR. Exclude FC_SIZE and FC_PIXEL_SIZE from listing
1351 pattern. Don't force scalable.
1353 * xftfont.c (xftfont_open): For generating a name, start from
1356 2006-06-16 Jan Dj
\e,Ad
\e(Brv <jan.h.d@swipnet.se>
1358 * frame.h (x_new_fontset2): Fix prototype.
1360 2006-06-16 Kenichi Handa <handa@m17n.org>
1362 * font.h (struct font_driver): Member parse_name deleted.
1363 (font_match_p, font_get_spec, font_parse_fcname)
1364 (font_unparse_fcname): Extern them.
1365 (font_get_name): Prototype adjusted.
1367 * font.c (XLFD_SMALLNUM_MASK): Delete this macro.
1368 (XLFD_LARGENUM_MASK): Delete XLFD_ENCODING_MASK from it.
1369 (font_expand_wildcards): Fix handling ENCODING field. Avoid
1370 unnecessary checks for weight, slant, and swidth.
1371 (font_parse_fcname): New function.
1372 (font_unparse_fcname): New function.
1373 (font_parse_name): New function.
1374 (font_match_p): New function.
1375 (font_get_name): Return value changed to Lisp string.
1376 (font_get_spec): New function.
1377 (Qunspecified, Qignore_defface): Don't extern them.
1378 (font_find_for_lface): Assume that LFACE is fully specified.
1379 (font_load_for_face): If lface[LFACE_FONT_INDEX] is an font
1380 object, use it for FACE.
1381 (font_open_by_name): Call Ffont_spec with QCname prop. Don't call
1383 (Ffont_spec): Call font_parse_name, not font_parse_xlfd.
1385 * fontset.h (new_fontset_from_font) [USE_FONT_BACKEND]: Prototype
1388 * fontset.c (new_fontset_from_font) [USE_FONT_BACKEND]: Argument F
1389 deleted. Don't call Fnew_fontset. Instead, directly call
1392 * frame.h (x_new_fontset2) [USE_FONT_BACKEND]: Prototype adjusted.
1394 * frame.c (x_set_font) [USE_FONT_BACKEND]: Adjusted for the change
1397 * ftfont.c (Qmonospace, Qsans_serif, Qserif, Qmono, Qsans)
1398 (Qsans__serif): New variables.
1399 (ftfont_generic_family_list): New variable.
1400 (syms_of_ftfont): Initialize the above variables.
1401 (ftfont_pattern_entity): Argument NAME deleted.
1402 (ftfont_list_generic_family): New function.
1403 (ftfont_parse_name): Delete this function.
1404 (ftfont_list): Try generic family only when FcFontList found no
1406 (ftfont_list_family): Fix args to FcObjectSetBuild.
1408 * xfaces.c (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
1409 object in attrs[LFACE_FONT_INDEX].
1410 (set_lface_from_font_name): Cancel all changes for font-backend.
1411 (set_lface_from_font_and_fontset) [USE_FONT_BACKEND]: New
1413 (Finternal_set_lisp_face_attribute) [USE_FONT_BACKEND]: Accept a
1414 font object in QCfont attribute.
1415 (set_font_frame_param) [USE_FONT_BACKEND]: Likewise.
1416 (realize_default_face) [USE_FONT_BACKEND]: Call
1417 set_lface_from_font_and_fontset.
1419 * xfns.c (x_default_font_parameter) [USE_FONT_BACKEND]: Try also
1420 "fixed", and signal error here if no suitable font was found.
1422 * xfont.c (xfont_parse_name): Delete this function.
1424 * xftfont.c (xftfont_open): Change coding style of error
1425 handling. Generate fontconfig's fontname pattern.
1427 * xterm.h (struct x_output) [USE_FONT_BACKEND]: New member fontp.
1428 (FRAME_FONT_OBJECT) [USE_FONT_BACKEND]: New macro.
1430 * xterm.c (x_new_fontset2) [USE_FONT_BACKEND]: Change arguments.
1431 Both args FONTSET and FONT_OBJECT must be existing ones.
1433 2006-06-16 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
1435 * macterm.c (mac_set_unicode_keystroke_event): Don't use MAKE_CHAR.
1437 2006-06-14 Kenichi Handa <handa@m17n.org>
1439 * xfont.c (xfont_open, xfont_encode_char): Fix typo.
1441 * font.h (struct font): Fix typo.
1443 * font.c (enum xlfd_field_index): Rename XLFD_XXX_SIZE_INDEX to
1445 (enum xlfd_field_mask): New enum.
1446 (intern_font_field): Argument changed. Caller changed. If digits
1447 are followed by non-digits, return a symbol.
1448 (font_expand_wildcards): New function.
1449 (font_parse_xlfd): Fix wildcard handling.
1450 (Ffont_spec): If :name is specified, reflect the info in the other
1453 * ftfont.c (ftfont_pattern_entity): Fix typo.
1454 (ftfont_list): Enforce FC_LANG in PATTERN to cancel the effect of
1457 2006-06-09 Kenichi Handa <handa@m17n.org>
1459 * font.h (Qiso8859_1, Qiso10646_1, Qunicode_bmp): Extern them.
1461 * font.c (Qiso8859_1, Qiso10646_1, Qunicode_bmp): Moved from
1463 (font_unparse_xlfd): Fix argument type declaration. Append "*" if
1464 registry doesn't specify encoding part.
1465 (font_find_for_lface): Pay attention to LFACE_FONT_INDEX.
1466 (font_open_by_name): At first try parsing the name.
1467 (syms_of_font): Declare Qiso8859_1, Qiso10646_1, and Qunicode_bmp
1470 * fontset.c (reorder_font_vector): Pay attention to the case that
1471 the 3rd element of font_def is nil.
1472 (fontset_font): For the default fontset, append one more fontset
1473 elements for a script-based font specification. Don't add script
1474 attribute on finding a font.
1475 (new_fontset_from_font): Unconditionally set FONTSET_ASCII to the
1477 (fontset_ascii_font): If a font can't be opened, return nil.
1479 * ftfont.c (Qiso8859_1, Qiso10646_1, Qunicode_bmp): Moved to
1481 (ftfont_pattern_entity): New function.
1482 (ftfont_get_cache): Assume that freetype_font_cache is already
1484 (ftfont_list): Handle the case that a file is specified in font
1485 name. Use ftfont_pattern_entity to generate entities.
1486 (ftfont_has_char): Check if the pattern contains FC_CHARSET.
1487 (syms_of_ftfont): Initialize freetype_font_cache.
1489 * xftfont.c (xftfont_open): Make the font name fontconfig's
1490 style. Add BLOCK_INPUT and UNBLOCK_INPUT.
1491 (xftfont_close): Free font->font.name if not NULL.
1493 * xfont.c (xfont_list): If script is specified for a font, return
1495 (xfont_list_family): Declare argument type.
1497 * xfaces.c (set_lface_from_font_name): If a font doesn't have a
1498 name, set LFACE_FONT (lface) to nil.
1500 * xterm.c (x_new_fontset2): If an ASCII font couldn't be loaded,
1503 2006-06-08 Jason Rumney <jasonr@gnu.org>
1505 * w32term.c (w32_initialize): Manually sync 2006-06-05 change from
1508 2006-06-08 Kenichi Handa <handa@m17n.org>
1510 * emacs.c (main): Check -enable-font-backend arg after the check
1512 (standard_args): Add "-enable-font-backend".
1514 * coding.c (Ffind_operation_coding_system): Sync with HEAD.
1516 * callproc.c (Fcall_process): Sync with HEAD.
1518 * coding.h (CODING_REQUIRE_ENCODING): Comment sync with HEAD.
1520 2006-06-07 Kenichi Handa <handa@m17n.org>
1522 * xftfont.c (xftfont_default_fid): Set fid_known to 1.
1523 (struct xftdraw_list, xftdraw_list): Delete them.
1524 (register_xftdraw, check_xftdraw): Delete them.
1525 (xftfont_prepare_face): Don't call register_xftdraw.
1526 (xftfont_done_face): Don't call check_xftdraw.
1527 (xftfont_draw): Get backroudn color only when with_background is
1530 * xfont.c (xfont_encode_char): Fix calculation of char2b.
1532 2006-06-06 Kenichi Handa <handa@m17n.org>
1534 These changes are for the new font handling codes.
1536 * Makefile.in (ALL_CFLAGS): Add @FREETYPE_CFLAGS@,
1537 @FONTCONFIG_CFLAGS@, and @LIBOTF_CFLAGS@.
1538 (LIB_X11_LIB): If HAVE_XFT is defined, set to @XFT_LIBS@.
1539 (FONTSRC, FONTOBJ): New variables.
1540 (obj): Add $(FONTOBJ).
1541 (SOME_MACHINE_OBJECTS): Lib_X11_Lib.
1542 (LIBES): Add @FREETYPE_LIBS@, @FONTCONFIG_LIBS@, and
1544 (font.o, ftfont.o, xfont.o, xftfont.o, ftxfont.o): New targets.
1545 (fontset.o, xdisp.o, xfaces.o, xfns.o, xterm.o): Depends on
1548 * font.h, font.c, xfont.c, ftfont.c, xftfont.c, ftxfont.c: New
1551 * character.h (Vscript_representative_chars): Extern it.
1553 * character.c (Vscript_representative_chars): New variable.
1554 (syms_of_character): Declare it as a Lisp variable.
1556 * composite.c (get_composition_id) [USE_FONT_BACKEND]: If
1557 enable_font_backend is nonzero, accept the composition method
1558 COMPOSITION_WITH_GLYPH_STRING.
1560 * composite.h (enum composition_method) [USE_FONT_BACKEND]: New
1561 enumeration COMPOSITION_WITH_GLYPH_STRING.
1563 * config.in: Re-generated.
1565 * dispextern.h (struct glyph_string) [USE_FONT_BACKEND]: New
1566 members clip_x, clip_y, clip_width, and clip_height.
1567 (struct face) [USE_FONT_BACKEND]: New members font_info and extra.
1569 * emacs.c (main) [USE_FONT_BACKEND]: Handle arg
1570 --enable-font-backend. Call syms_of_font.
1572 * fns.c (assoc_no_quit): New function.
1574 * fontset.h (FONT_INFO_FROM_FACE): New macro.
1575 (face_for_font, new_fontset_from_font)
1576 (fontset_ascii_font) [USE_FONT_BACKEND]: Extern them.
1578 * fontset.c [USE_FONT_BACKEND]: Include "font.h".
1579 (fontset_font, fontset_ascii, face_for_char)
1580 (make_fontset_for_ascii_face, Ffont_info)
1581 (Finternal_char_font) [USE_FONT_BACKEND]: If enable_font_backend
1582 is nonzero, use font-backend mechanism.
1583 (find_font_encoding): Make it non-static.
1584 (new_fontset_from_font, fontset_ascii_font) [USE_FONT_BACKEND]:
1587 * frame.h (struct frame): New members resx and resy.
1588 (struct frame) [USE_FONT_BACKEND]: New member font_driver_list.
1589 (x_new_fontset2) [USE_FONT_BACKEND]: Extern it.
1591 * frame.c [USE_FONT_BACKEND]: Include "font.h".
1592 (make_frame, x_set_font) [USE_FONT_BACKEND]: Use font-backend
1595 * lisp.h (assoc_no_quit): Extern it.
1597 * xdisp.c: If USE_FONT_BACKEND is defined, include "font.h".
1598 Through out the file, use FONT_INFO_FROM_FACE instead of
1599 FONT_INFO_FROM_ID, use get_per_char_metric instead of
1600 rif->per_char_metric.
1601 (handle_composition_prop) [USE_FONT_BACKEND]: If the composition
1602 method is COMPOSITION_WITH_GLYPH_STRING, just set it->c to ' '.
1603 (get_glyph_face_and_encoding, fill_composite_glyph_string)
1604 (get_char_face_and_encoding, BUILD_COMPOSITE_GLYPH_STRING)
1605 (x_produce_glyphs) [USE_FONT_BACKEND]: If enable_font_backend is
1606 nonzero, use font-backend mechanism.
1607 (get_per_char_metric): New function.
1609 * xfaces.c [USE_FONT_BACKEND]: Include "font.h".
1610 (set_lface_from_font_name)
1611 (set_font_frame_param, free_realized_face)
1612 (prepare_face_for_display, clear_face_gcs)
1613 (Finternal_set_font_selection_order, realize_x_face)
1614 [USE_FONT_BACKEND]: If enable_font_backend is nonzero, use
1615 font-backend mechanism.
1616 (clear_face_cache) [USE_FONT_BACKEND]: Don't call
1618 (load_face_font) [USE_FONT_BACKEND]: Abort.
1619 (face_symbolic_value, face_symbolic_weight, face_symbolic_slant)
1620 (face_symbolic_swidth, face_for_font) [USE_FONT_BACKEND]: New
1623 * xfns.c [USE_FONT_BACKEND]: Include "font.h".
1624 (x_default_font_parameter) [USE_FONT_BACKEND]: New function.
1625 (Fx_create_frame) [USE_FONT_BACKEND]: If enable_font_backend is
1626 nonzero, register all available font drivers. Call
1627 x_default_font_parameter for deciding a font.
1628 (x_create_tip_frame) [USE_FONT_BACKEND]: Likewise.
1630 * xterm.c [USE_FONT_BACKEND]: Include "font.h".
1631 (x_set_mouse_face_gc, x_set_glyph_string_clipping)
1632 (x_set_glyph_string_clipping_exactly)
1633 (x_compute_glyph_string_overhangs)
1634 (x_draw_glyph_string_foreground)
1635 (x_draw_composite_glyph_string_foreground, x_draw_glyph_string)
1636 (x_free_frame_resources) [USE_FONT_BACKEND]: If
1637 enable_font_backend is nonzero, use font-backend mechanism.
1638 (x_new_fontset2) [USE_FONT_BACKEND]: New function.
1640 2006-05-15 Kenichi Handa <handa@m17n.org>
1642 * coding.h (system_eol_type): Fix synching with HEAD.
1644 * coding.c (system_eol_type): Sync with HEAD.
1645 (coding_inherit_eol_type): If PARENT is nil, inherit from
1647 (syms_of_coding): Initialize system_eol_type.
1649 * callproc.c (Fcall_process): Sync with HEAD.
1651 * process.c (setup_process_coding_systems): Fix synching with
1653 (read_process_output): Likewise.
1654 (Fset_process_coding_system): Inherit system's eol format if
1657 * fileio.c (choose_write_coding_system): Fix synching with HEAD.
1659 * keymap.c (push_key_description): Fix synching with HEAD.
1661 2006-05-02 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
1663 * macgui.h (USE_ATSUI): Don't enable on emacs-unicode-2 branch.
1665 2006-04-07 Kenichi Handa <handa@m17n.org>
1667 * coding.c (decode_eol): Pay attention to buffer relocation in
1669 (decode_coding): Call decode_eol before restoring undo_list.
1671 2006-03-20 Kenichi Handa <handa@m17n.org>
1673 * charset.c (Fdefine_charset_internal): Fix setting of
1676 2006-03-14 Kenichi Handa <handa@m17n.org>
1678 * keyboard.c (read_char): Check if C is a character or not before
1679 looking up Vkeyboard_translate_table.
1681 2006-03-10 Kenichi Handa <handa@m17n.org>
1683 * coding.c (DECODE_EMACS_MULE_20_RELATIVE_COMPOSITION): Fix
1684 condition to terminate the loop.
1686 2006-03-09 Kenichi Handa <handa@m17n.org>
1688 * coding.c (produce_composition): Compare charbuf[i] instead of
1690 (Fterminal_coding_system): Use EQ to compare Lisp objects.
1692 2006-03-07 Kenichi Handa <handa@m17n.org>
1694 * coding.c (DECODE_COMPOSITION_START): If the source is short, set
1695 coding->result to CODING_RESULT_INSUFFICIENT_SRC.
1696 (decode_coding_gap): Set CODING_MODE_LAST_BLOCK after the call of
1698 (emacs_mule_char): Handle old style (Emacs 20) component character
1700 (DECODE_EMACS_MULE_COMPOSITION_RULE_20): Fix parsing a composition
1702 (DECODE_EMACS_MULE_20_RULEBASE_COMPOSITION): Likewise.
1703 (decode_coding_emacs_mule): Handle invalid bytes correctly.
1705 2006-03-04 Kenichi Handa <handa@m17n.org>
1707 * coding.c (encode_coding_ccl): Allocate destination dynamically
1710 2006-03-03 Kenichi Handa <handa@m17n.org>
1712 * ccl.c (Fccl_execute_on_string): Fix the condition of terminating
1713 the loop. When quitted, show a proper error message.
1715 2006-03-02 Kenichi Handa <handa@m17n.org>
1717 * coding.c (decode_coding): Fix previous change.
1719 * xterm.c (x_set_glyph_string_clipping_exactly): Set
1720 src->clip_head and src->clip_tail temporarily instead of src->hl.
1722 * ccl.c (CCL_WRITE_STRING): Handle a flag bit for multibyte
1724 (Fccl_execute_on_string): Use ASET, not XSET.
1726 2006-03-01 Kenichi Handa <handa@m17n.org>
1728 * search.c (search_buffer): Fix handling of "\\" in a trivial
1731 2006-02-28 Kenichi Handa <handa@m17n.org>
1733 * coding.c (decode_coding): Fix the condition of terminating the
1736 2006-02-27 Kenichi Handa <handa@m17n.org>
1738 * data.c (Faset): On setting a character bigger than 255 in a
1739 unibyte string, signal an error instead of make the string
1742 2006-02-22 Kenichi Handa <handa@m17n.org>
1744 * charset.c (map_charset_chars): Fix for ascii-compatible charset
1745 made by a mapping table.
1747 2006-02-21 Kenichi Handa <handa@m17n.org>
1749 * xdisp.c (fill_composite_glyph_string): Check s->face is NULL or
1751 (BUILD_COMPOSITE_GLYPH_STRING): If C is TAB, set s->face to NULL.
1752 (x_produce_glyphs): If CH is TAB, set cmp->offsets properly.
1754 * xterm.c (x_draw_composite_glyph_string_foreground): Check
1755 s->face is NULL or not.
1757 2006-02-20 Kenichi Handa <handa@m17n.org>
1759 * xterm.c (x_set_glyph_string_clipping_exactly): New function.
1760 (x_draw_glyph_string): Fix drawing of right_overhang and
1761 left_overhang around/on cursor.
1763 * xdisp.c (draw_glyphs): Fix inclusion of right_overwriting
1766 * term.c (produce_glyphs): Sync to HEAD.
1768 2006-02-15 Kenichi Handa <handa@m17n.org>
1770 * xdisp.c (x_produce_glyphs): Handle composition with TAB.
1772 2006-02-05 Kenichi Handa <handa@m17n.org>
1774 * coding.c: Cancel incorrect synching with HEAD.
1776 2006-02-03 Kenichi Handa <handa@m17n.org>
1778 * coding.c (Fdefine_coding_system_internal): Avoid a duplicated
1779 element in Vcoding_system_alist.
1780 (Fdefine_coding_system_alias): Likewise.
1782 2006-01-19 Kenichi Handa <handa@m17n.org>
1784 * xterm.c (handle_one_xevent): Handle keysyms 0x1000000..0x10000FF.
1786 * coding.c: Sync to HEAD for handling autoload-coding-system.
1787 (Qcoding_system_define_form): New variable.
1788 (syms_of_coding): Intern and staticpro it.
1789 (Fcoding_system_p): Check Qcoding_system_define_form.
1790 (Fcheck_coding_system): Try to autoload the definition of
1793 * coding.h (CODING_SYSTEM_P): If ID is not available, call
1795 (CHECK_CODING_SYSTEM): If ID is not available, call
1796 Fcheck_coding_system.
1797 (CHECK_CODING_SYSTEM_GET_SPEC): Try also Fcheck_coding_system.
1798 (CHECK_CODING_SYSTEM_GET_ID): Likewise.
1800 2006-01-17 Kenichi Handa <handa@m17n.org>
1802 * xterm.c (handle_one_xevent): Delete unnecessary code inserted by
1805 * coding.c (code_conversion_restore): GCPRO arg.
1807 2005-12-28 Kenichi Handa <handa@m17n.org>
1809 * character.c (lisp_string_width): Check multibyteness of STRING.
1811 2005-10-18 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
1813 * macterm.c (mac_encode_char): Call ccl_driver with the last arg
1814 Qnil. Use JIS_TO_SJIS instead of ENCODE_SJIS.
1815 (decode_mac_font_name): Use decode_coding_c_string instead of
1817 (x_load_font): Initialize fontp->fontset to -1. Set
1818 fontp->encoding_type.
1820 2005-10-17 Kenichi Handa <handa@m17n.org>
1822 * search.c (search_buffer): Give up BM search on case-fold-search
1823 if one of a target character has a case-equivalence of different
1824 byte length even if that target charcter is an ASCII.
1825 (simple_search): Fix culculation of byte length of matched text.
1826 (boyer_moore): Fix handling of case-equivalent multibyte
1829 2005-10-15 Kenichi Handa <handa@m17n.org>
1831 * coding.c (decode_coding): Fix handling of invalid bytes.
1833 2005-10-06 Kenichi Handa <handa@m17n.org>
1835 * xterm.c (handle_one_xevent): Handle keysyms directly mapped to
1838 2005-09-23 Kenichi Handa <handa@m17n.org>
1840 * coding.c (encode_coding_object): If a pre-write-conversion
1841 function makes a new buffer, kill it.
1843 2005-07-29 Kenichi Handa <handa@m17n.org>
1845 * coding.c (QCascii_compatible_p): New variable.
1846 (syms_of_coding): Initialize it.
1847 (ONE_MORE_BYTE): Decrement `src' before calling string_char.
1848 (ONE_MORE_BYTE_NO_CHECK): Likewise.
1849 (record_conversion_result): Add `default:' case.
1850 (coding_charset_list): Delete unused variable `coding_type'.
1851 (Fdefine_coding_system_internal): Add `ascii-compatible-p'
1852 property in the plist of the coding system.
1853 (Fcoding_system_put): Check QCascii_compatible_p.
1855 2005-06-09 Kenichi Handa <handa@m17n.org>
1857 * xdisp.c (get_next_display_element): Sync with the change in
1860 2005-06-06 Kenichi Handa <handa@m17n.org>
1862 * callproc.c (Fcall_process): Sync with the change in
1865 2005-06-05 Miles Bader <miles@gnu.org>
1867 * xfaces.c (Finternal_lisp_face_equal_p): Restore previously
1868 removed calculation of frame `f', as it's now used.
1870 2005-05-22 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
1872 * macterm.c (x_font_name_to_mac_font_name): Sync with trunk
1873 for the case that does not require code conversion.
1875 2005-05-11 Kenichi Handa <handa@m17n.org>
1877 * Makefile.in (shortlisp): Cancel previous change.
1878 (RUN_TEMACS): Include "-nl" if HAVE_SHM is defined.
1879 (emacs${EXEEXT}): Run $(RUN_TEMACS) unconditionally.
1880 (UNIDATA): New variable.
1881 (${lispsource}international/charprop.el): Depends on ${UNIDATA}.
1882 (bootstrap-emacs${EXEEXT}): Depends on charprop.el. Run
1883 $(RUN_TEMACS) unconditionally.
1885 2005-05-10 Kenichi Handa <handa@m17n.org>
1887 * Makefile.in (shortlisp): Add ../lisp/international/charprop.el.
1888 (temacs${EXEEXT}): Build charprop.el if necessary.
1889 (admindir): New variable.
1890 ($(lispsource)international/charprop.el): New target.
1892 2005-05-04 Miles Bader <miles@gnu.org>
1894 * character.c (chars-in-region): Obsolete function removed.
1895 (syms_of_character): Remove its initialization.
1897 2005-04-28 Benjamin Riefenstahl <b.riefenstahl@turtle-trading.net>
1899 * w32select.c (validate_coding_system)
1900 (setup_windows_coding_system): New functions.
1901 (convert_to_handle_as_coded, Fw32_get_clipboard_data): Use
1902 setup_windows_coding_system.
1903 (setup_config, Fw32_get_clipboard_data): Use
1904 validate_coding_system.
1905 (Fx_selection_exists): Move call to setup_config to a place
1906 were signals are allowed.
1908 * lisp.h (Fcoding_system_base, Fcoding_system_eol_type)
1909 (Fcheck_coding_system): Add declarations.
1911 2005-04-28 Kenichi Handa <handa@m17n.org>
1913 * s/ms-w32.h (STDC_HEADERS): Sync with the change in
1916 2005-04-25 Kenichi Handa <handa@m17n.org>
1918 * charset.c (load_charset_map_from_vector): Fix for the first
1921 2005-04-22 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
1923 * macfns.c (Fx_create_frame, x_create_tip_frame): Pass Lisp
1924 string as the second argument for x_new_fontset.
1926 2005-04-18 Kenichi Handa <handa@m17n.org>
1928 * fns.c (Fstring_as_multibyte): Fix the change for syncing with
1931 2005-04-09 Kenichi Handa <handa@m17n.org>
1933 * search.c (search_buffer): Fix the change for syncing with CVS
1935 (search_buffer): Likewise.
1937 2005-03-31 Kenichi Handa <handa@m17n.org>
1939 * xdisp.c (get_next_display_element): Sync with CVS head.
1941 2005-03-29 Kenichi Handa <handa@m17n.org>
1943 * coding.c (decode_coding_object): Use safe_call1 instead of call1.
1944 (encode_coding_object): Use safe_call instead of call2.
1946 2005-03-14 Kenichi Handa <handa@m17n.org>
1948 * fontset.c (set_default_ascii_font): Fix the change for
1949 syncing with CVS head.
1951 2005-01-30 Kenichi Handa <handa@m17n.org>
1953 * fontset.c (Fset_fontset_font): Check family element of a given
1956 * Makefile.in (lisp): Include charprop.el.
1958 2005-01-17 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
1960 * macfns.c (Fx_create_frame, x_create_tip_frame): Fix crash.
1961 Not sure if it's unnecessary.
1963 2005-01-16 Steven Tamm <steventamm@mac.com>
1965 * macfns.c (Fx_create_frame, x_create_tip_frame): ifdef'd out
1966 some possibly unnecessary fontset checking code that crashed
1967 when creating a new frame
1969 2005-01-17 Kenichi Handa <handa@m17n.org>
1971 * xfaces.c (merge_faces): Fix argument to lookup_derived_face and
1974 * xdisp.c (Fformat_mode_line): Fix argument to lookup_named_face.
1976 * fringe.c (draw_fringe_bitmap_1): Fix argument to
1979 2004-12-25 Kenichi Handa <handa@m17n.org>
1981 * xdisp.c (get_next_display_element): Sync to the change in HEAD
1984 2004-12-11 Kenichi Handa <handa@m17n.org>
1986 * search.c: Sync to the change in HEAD on 2004-11-19, 20.
1988 * w32console.c: Sync to the change in HEAD on 2004-12-01.
1990 * coding.c: Cancel the change done in HEAD on 2004-11-30.
1991 (coding_charset_list): New function.
1993 * coding.h (coding_charset_list): Extern it.
1995 * term.c: Sync to the change in HEAD on 2004-11-30.
1997 2004-12-09 Kenichi Handa <handa@m17n.org>
1999 * fontset.c (Fset_fontset_font): Call find_font_encoding with
2000 concatenation of family and registry.
2002 2004-12-06 Kenichi Handa <handa@m17n.org>
2004 * character.h (BYTE8_STRING): Fix typo.
2006 * editfns.c (Ftranslate_region_internal): Don't convert unibyte
2007 string to multibyte (sync to HEAD).
2009 * casefiddle.c (casify_region): Handle changes in byte-length
2010 using replace_range_2 (sync to HEAD).
2012 2004-11-24 Andreas Schwab <schwab@suse.de>
2014 * chartab.c (map_char_table): GCPRO table and arg.
2016 2004-10-29 Kenichi Handa <handa@m17n.org>
2018 * syntax.c (skip_syntaxes): Return lispy 0 (not nil) if point is
2021 2004-10-23 Kenichi Handa <handa@m17n.org>
2023 * fontset.c (fs_load_font): Use fast_string_match_ignore_case
2024 instead of fast_c_string_match_ignore_case.
2025 (find_font_encoding): Argument changed to Lisp_Object. Use
2026 fast_string_match_ignore_case instead of
2027 fast_c_string_match_ignore_case. Caller changed.
2029 2004-10-15 Kenichi Handa <handa@m17n.org>
2031 * xdisp.c (get_next_display_element): In unibyte case, decide to
2032 display in octal form by checking a chacter by
2033 UNIBYTE_CHAR_HAS_MULTIBYTE_P.
2035 * charset.c (Fset_unibyte_charset): Setup
2036 unibyte_has_multibyte_table.
2038 * character.c (unibyte_has_multibyte_table): New variable.
2040 * character.h (unibyte_has_multibyte_table): Extern it.
2041 (UNIBYTE_CHAR_HAS_MULTIBYTE_P): New macro.
2043 2004-10-14 Kenichi Handa <handa@m17n.org>
2045 * callproc.c (Fcall_process): Fix merging of 2004-10-13 change.
2047 2004-10-13 Kenichi Handa <handa@m17n.org>
2049 * coding.c (encode_coding_iso_2022): Fix handling of charset
2052 2004-10-12 Kenichi Handa <handa@m17n.org>
2054 * coding.c (setup_coding_system): If coding_system is nil, use
2056 (Fterminal_coding_system): Return nil if terminal coding system is
2058 (syms_of_coding): Define coding-system `undecided' here. Setup
2059 terminal_coding as `undecided'.
2061 2004-10-04 Kenichi Handa <handa@m17n.org>
2063 * xdisp.c (message_dolog, set_message_1): Call
2064 unibyte_char_to_multibyte with arg type int.
2066 * fileio.c (Fsubstitute_in_file_name): Fix previous change.
2068 * lread.c (read1): Fix reading of a char-table.
2070 * print.c (print_object): Include sub char-table in cicularities
2073 2004-10-01 Kenichi Handa <handa@m17n.org>
2075 * keymap.c (where_is_internal_2): Fix for the case that KEY is a
2076 cons. Append the found sequences in car of ARGS instead of
2079 2004-09-28 Kenichi Handa <handa@m17n.org>
2081 * fileio.c (report_file_error): Make a unibyte string from
2083 (Fsubstitute_in_file_name): Fix the arg to
2084 unibyte_char_to_multibyte. It is evaluated twice.
2086 2004-09-19 Kenichi Handa <handa@m17n.org>
2088 * charset.h (CHAR_CHARSET): Shortcut for ASCII case.
2090 2004-09-14 Kenichi Handa <handa@m17n.org>
2092 * coding.c (detect_coding): Fix previous change.
2094 2004-09-13 Kenichi Handa <handa@m17n.org>
2096 * coding.c (detect_coding_utf_16): Don't set detect_info->found if
2098 (detect_coding): Optimization for ISO-2022 when no 8-bit data is
2100 (detect_coding_system): Likewise.
2102 2004-09-01 Jason Rumney <jasonr@gnu.org>
2104 * w32fns.c (x_to_w32_font): Update to use new coding struct.
2106 2004-08-17 Kenichi Handa <handa@m17n.org>
2108 * charset.c (Fdeclare_equiv_charset): Fix handing of CHARS.
2109 (Fiso_charset): Likewise.
2111 2004-08-03 Steven Tamm <steventamm@mac.com>
2113 * macterm.c (mac_encode_char): Add charset argument and update
2114 to use encoding_type.
2115 (x_new_font,x_new_fontset): Merge in changes from xterm.c;
2116 switch to pure fontset
2117 (decode_mac_font_name): Temporarily remove decoding
2118 (x_font_name_to_mac_font_name): Temporarily remove encoding
2119 (x_load_font): Temporarily remove encoding
2121 2004-06-30 Kenichi Handa <handa@m17n.org>
2123 * xfaces.c (Fface_font): If frame is not on a window system,
2124 ignore CHARACTER arg. If HAVE_WINDOW_SYSTEM is not defined, don't
2125 refer to face->font.
2126 (split_font_name_into_vector, build_font_name_from_vector)
2127 (lookup_non_ascii_face, realize_non_ascii_face): Define them only
2128 whne HAVE_WINDOW_SYSTEM is defined.
2130 2004-05-29 Kenichi Handa <handa@m17n.org>
2132 * xdisp.c (BUILD_GLYPH_STRINGS): Check if s is NULL.
2133 (x_produce_glyphs): Fix setting of members of cmp in case
2134 cmp->glyph_len is zero,
2136 * fontset.c (Fset_fontset_font): Docstring fixed.
2137 (Ffontset_info): Make it backward compatible. New arg ALL.
2139 2004-05-11 Kim F. Storm <storm@cua.dk>
2141 * process.c (read_process_output): Grow decoding_buf when needed;
2142 this could cause a crash in allocate_string and compact_small_strings.
2144 2004-04-29 Kenichi Handa <handa@m17n.org>
2146 * fileio.c (WRITE_BUF_SIZE): This macro deleted.
2147 (e_write): Fix previous change.
2149 2004-04-28 Kenichi Handa <handa@m17n.org>
2151 * coding.c (setup_coding_system): Set coding->common_flags
2152 correctly for raw-text.
2153 (consume_chars): On encoding unibyte text by raw-text, don't check
2155 (encode_coding): On encoding by raw-text, never use translation
2158 * fileio.c (e_write): Short cut for the case of no encoding.
2160 2004-04-20 Kenichi Handa <handa@m17n.org>
2162 * coding.c (detect_coding): Delete unused variables.
2163 (detect_coding_system): Likewise.
2165 2004-04-18 Kenichi Handa <handa@m17n.org>
2167 * coding.c (encode_coding_utf_8): Fix handling of raw-byte char.
2168 (consume_chars): Fix handling of 8-bit bytes in unibyte source.
2170 2004-04-14 Kenichi Handa <handa@m17n.org>
2172 Sync all files to HEAD.
2174 2004-04-14 Kenichi Handa <handa@m17n.org>
2176 * coding.c (Ffind_coding_systems_region_internal): Include
2177 raw-text and no-conversion in the result.
2179 * fontset.h: Sync to HEAD.
2181 * fontset.c: Sync to HEAD.
2183 2004-04-14 Kenichi Handa <handa@m17n.org>
2185 * fontset.c (find_font_encoding): Return `ascii' for unknown
2187 (load_font_get_repertory): Delete unnecessary check of ENCODING of
2189 (font_def_arg, add_arg, from_arg, to_arg): New args.
2190 (set_fontset_font): Argument changed.
2191 (Fset_fontset_font): Fix for the case that TARGET is a script
2192 name and charset name.
2193 (new_fontset_from_font_name): Fix argument to Fnew_fontset.
2195 2004-04-13 Kenichi Handa <handa@m17n.org>
2197 * fontset.c (fontset_font): Renamed from fontset_face. Return
2199 (face_suitable_for_char_p): Adjusted for the change of
2201 (face_for_char): Likewise.
2202 (make_fontset_for_ascii_face): Fix setting of the fontset element
2204 (Finternal_char_font): Use fontset_font instead of FACE_FOR_CHAR
2206 (Ffontset_info): Adjusted for the change of fontset_font.
2208 * composite.c: Sync to HEAD.
2210 * search.c: Sync to HEAD.
2212 * coding.c: Sync to HEAD.
2213 (emacs_mule_char): Check invalid code more regidly.
2215 * coding.h: Sync to HEAD.
2217 * charset.c: Sync to HEAD.
2219 * charset.h: Sync to HEAD.
2221 * character.h (LEADING_CODE_LATIN_1_MIN)
2222 (LEADING_CODE_LATIN_1_MAX): Delete these macros.
2224 2004-04-08 Kenichi Handa <handa@m17n.org>
2226 * category.h: Sync to HEAD.
2228 * category.c: Sync to HEAD.
2230 * syntax.h: Sync to HEAD.
2232 * syntax.c: Sync to HEAD.
2234 * regex.h: Sync to HEAD.
2236 * regex.c: Sync to HEAD.
2238 2004-04-07 Kenichi Handa <handa@m17n.org>
2240 * editfns.c: Sync to HEAD.
2241 (check_translation): New function.
2242 (Ftranslate_region_internal): Handle M:N mapping.
2244 2004-04-06 Kenichi Handa <handa@m17n.org>
2246 * xfaces.c (xlfd_point_size): Set font->numeric[XLFD_PIXEL_SIZE].
2248 2004-03-30 Kenichi Handa <handa@m17n.org>
2250 * coding.c (DECODE_DESIGNATION): Set chars_96 to -1 instead of
2252 (decode_coding_iso_2022): Fix handling of invalid designation.
2254 * fileio.c (Finsert_file_contents): Be sure to call unbind_to
2255 after calling code_conversion_save.
2257 2004-03-11 Kenichi Handa <handa@m17n.org>
2259 * xdisp.c (handle_auto_composed_prop): Fix Lisp_Object/int mixup.
2261 * print.c (print_prune_string_charset): Fix Lisp_Object/int mixup.
2263 * fontset.c: Include "intervals.h".
2264 (fontset_face): Fix comparing of Lisp_Objects.
2265 (free_face_fontset): Fix Lisp_Object/int mixup.
2266 (new_fontset_from_font_name): Likewise.
2268 * editfns.c (Ftranslate_region_internal): Fix Lisp_Object/int mixup.
2270 * coding.c: Add many prototypes for static functions.
2271 (get_translation_table): Allow max_lookup to be NULL.
2272 (decode_coding): Call get_translation_table with max_lookup NULL.
2273 (Ffind_coding_systems_region_internal): Likewise.
2274 (Funencodable_char_position, Fcheck_coding_systems_region):
2277 2004-03-11 Kenichi Handa <handa@m17n.org>
2279 * coding.c (get_translation_table): Declare it as Lisp_Object.
2280 (LOOKUP_TRANSLATION_TABLE): New macro.
2281 (produce_chars): Use LOOKUP_TRANSLATION_TABLE instead of
2283 (consume_chars): Likewise.
2285 2004-03-11 Kenichi Handa <handa@m17n.org>
2287 * coding.c (MAX_ANNOTATION_LENGTH): Adjusted for the change of
2288 annotation data format.
2289 (ADD_ANNOTATION_DATA, ADD_COMPOSITION_DATA, ADD_CHARSET_DATA):
2290 Change arguments FROM and TO to single argument NCHARS. Caller
2292 (decode_coding_utf_8): Pay attention to coding->charbuf_used.
2293 (decode_coding_utf_16, decode_coding_emacs_mule)
2294 (decode_coding_iso_2022, decode_coding_sjis, decode_coding_big5)
2295 (decode_coding_ccl, decode_coding_charset): Likewise.
2296 (get_translation): New function.
2297 (produce_chars): New arguments translation_table and last_block.
2298 Translate characters here. Return number of carryover chars.
2300 (produce_composition): New argument pos. Caller changed.
2301 Adjusted for the change of annotation data format.
2302 (produce_charset, produce_annotation): Likewise.
2303 (decode_coding, encode_coding): Don't call translate_chars.
2304 (consume_chars): New arg translation_table. Caller changed.
2305 (translate_chars): Deleted.
2306 (syms_of_coding): Make translation-table's number of extra slots
2309 2004-03-09 Kenichi Handa <handa@m17n.org>
2311 * search.c (simple_search): Fix setting this_pos_byte in backward
2314 * coding.c (detect_coding_emacs_mule): Fix counting of encoded
2316 (detect_coding_ccl): Fix setting of the variable valids.
2318 2004-03-04 Kenichi Handa <handa@m17n.org>
2320 * xterm.c (x_list_fonts): Fix the detection of an auto-scaled font.
2322 * coding.c (decode_coding_utf_16): Fix handling of surrogate pair.
2324 * editfns.c (Ftranslate_region_internal): Renamed from
2325 Ftranslate_region. Accept a char-table in TABLE.
2326 (syms_of_editfns): Defsubr Stranslate_region_internal.
2328 * xfaces.c (set_lface_from_font_name): If a font is specified for
2329 a frame, generate a fontset from the font.
2330 (build_scalable_font_name): If the scalable font is requested for
2331 a specific size, don't change that size.
2332 (try_font_list): Try a scalable font also in the case that a
2333 pattern string is specified,
2336 2004-03-03 Kenichi Handa <handa@m17n.org>
2338 * xfaces.c (Fface_font): New optional arg CHARACTER.
2340 2004-02-17 Kenichi Handa <handa@m17n.org>
2342 * charset.h (CHARSET_OFFSET): New macro.
2344 2004-02-13 Kenichi Handa <handa@m17n.org>
2346 * xterm.c (x_get_font_repertory): Fix for non-Unicode-bmp charset.
2348 * fontset.c (fontset_face): Handle the case that repertory is a
2350 (find_font_encoding): Return nil for unknown encoding.
2351 (Fset_fontset_font): Ignore a font of unknown encoding.
2353 2004-02-09 Kenichi Handa <handa@m17n.org>
2355 * keymap.c (describe_vector): Handle default value of a char
2358 * fontset.c (fontset_face): Handle fallback fonts correctly.
2359 (Ffontset_info): Return infomation about fallback fonts.
2361 2004-02-06 Kenichi Handa <handa@m17n.org>
2363 * fontset.c (FONTSET_DEFAULT): New macro.
2364 (FONTSET_ADD): Handle the case that range is nil.
2365 (fontset_add): Likewise.
2366 (Fset_fontset_font): Change the 2nd arg name to TARGET, and handle
2367 the case that it is nil.
2368 (dump_fontset): Call FONTSET_DEFAULT, not FONTSET_FALLBACK.
2369 (syms_of_fontset): Set char-table-extra-slots property of fontset
2372 * charset.h (CHAR_CHARSET_P): Fix for the case that the method is
2375 2004-01-30 Kenichi Handa <handa@m17n.org>
2377 * emacs.c (main): Call init_charset after syms_of_XXX.
2379 * charset.c (Vcharset_map_directory): Deleted.
2380 (Vcharset_map_path): New variable
2381 (load_charset_map_from_file): Use Vcharset_map_path instead.
2382 (init_charset): Initialize Vcharset_map_path.
2383 (syms_of_charset): Delete declaration of "charset-map-directory",
2384 add declaration of "charset-map-path".
2386 2004-01-29 Kenichi Handa <handa@m17n.org>
2388 * fns.c (string_char_to_byte): Optimize for ASCII only string.
2389 (string_byte_to_char): Likewise.
2391 * fileio.c (Finsert_file_contents): Avoid detecting a code twice.
2393 * coding.c (detect_coding_iso_2022): Fix handling of SS2 and SS3.
2394 (detect_coding): Treat '\0' as normal ASCII byte..
2395 (detect_coding_system): Likewise.
2397 2004-01-27 Kenichi Handa <handa@m17n.org>
2399 * coding.h (SJIS_TO_JIS2, JIS_TO_SJIS2): New macros.
2401 * coding.c (QCmnemonic, QCdefalut_char)
2402 (QCdecode_translation_table, QCencode_translation_table)
2403 (QCpost_read_conversion, QCpre_write_conversion): New variables.
2404 (get_translation_table): Return a list of translation tables if
2406 (decode_coding): Call get_translation_table with ENCODEP 0.
2407 (char_encodable_p): If translation_table is non-nil, always call
2409 (Fdefine_coding_system_internal): Accept list of translation
2410 tables as :encode-translation-table and :decode-translation-table.
2411 (Fcoding_system_put): New function.
2412 (syms_of_coding): Declare new symbols. Defsubr
2414 (decode_coding_sjis): Handle 4th charset (typically JISX0212).
2415 (encode_coding_sjis): Likewise.
2417 * charset.c (map_charset_chars): Fix arg to map_charset_chars in
2418 when the charset is superset type.
2420 * character.c (translate_char): Accept list of translation tables.
2422 2004-01-25 Kenichi Handa <handa@m17n.org>
2424 * coding.h (enum coding_attr_index): New member
2425 coding_attr_trans_tbl.
2426 (CODING_ATTR_TRANS_TBL): New macro.
2428 * coding.c (get_translation_table): New function.
2429 (translate_chars): Fix the bug of skipping annotation data.
2430 (decode_coding): Utilze get_translation_table.
2431 (encode_coding): Likewise.
2432 (char_encodable_p): Translate char if necessary.
2433 (Funencodable_char_position): Likewise.
2434 (Ffind_coding_systems_region_internal): Setup translation table
2435 for encode in a coding system attribute vector in advance.
2436 (Fcheck_coding_systems_region): Likewise.
2437 (Fdefine_coding_system_internal): Allow a symbol as translation
2438 table. For shift-jis type coding system, allow 4th charset.
2440 2004-01-24 Kenichi Handa <handa@m17n.org>
2442 * coding.c (decode_coding_sjis): Check the first byte rigidly.
2444 * xdisp.c (get_next_display_element): Pass -1 as POS to
2445 FACE_FOR_CHAR if displaying a C-string.
2447 2004-01-23 Kenichi Handa <handa@m17n.org>
2449 * composite.c (get_composition_id): Handle xoff and yoff in a
2452 * composite.h (COMPOSITION_DECODE_RULE): New arg xoff and yoff.
2453 (struct composition): New member lbearing and rbearing.
2455 * xdisp.c (move_it_to): Optimize for the case (op & MOVE_TO_Y).
2456 (x_get_glyph_overhangs): Handle a composition glyph.
2457 (x_produce_glyphs): Setup lbearing and rbreaing for a composition
2460 * xterm.c (x_compute_glyph_string_overhangs): Handle also a
2463 2004-01-18 Kenichi Handa <handa@m17n.org>
2465 * print.c: Include charset.h.
2466 (Vprint_charset_text_property): New variable.
2467 (Qdefault): Extern it.
2468 (PRINT_STRING_NON_CHARSET_FOUND)
2469 (PRINT_STRING_UNSAFE_CHARSET_FOUND): New macros.
2470 (print_check_string_result): New variable.
2471 (print_check_string_charset_prop): New function.
2472 (print_prune_charset_plist): New variable.
2473 (print_prune_string_charset): New function.
2474 (print_object): Call print_prune_string_charset if
2475 Vprint_charset_text_property is not t.
2476 (print_interval): Print nothing if itnerval->plist is nil.
2477 (syms_of_print): Declare Vprint_charset_text_property as a lisp
2478 variable. Init and staticpro print_prune_charset_plist.
2480 2004-01-15 Kenichi Handa <handa@m17n.org>
2482 * fontset.c (new_fontset_from_font_name): Use the specified font
2483 for all characters in the new fontset.
2485 * macterm.c (x_set_mouse_face_gc): Call FACE_FOR_CHAR with POS and
2488 * xdisp.c (x_produce_glyphs): Call FACE_FOR_CHAR with POS and
2489 OBJECT args for composition too.
2491 * w32term.c (x_set_mouse_face_gc): Call FACE_FOR_CHAR with POS and
2494 2004-01-13 Kenichi Handa <handa@m17n.org>
2496 * dispextern.h (FACE_FOR_CHAR): New args POS and OBJECT.
2498 * fontset.c (reorder_font_vector): Adjusted for the change of
2500 (fontset_face): New arg id. Caller changed.
2501 (face_for_char): New args pos and object.
2502 (make_fontset_for_ascii_face): Adjusted for the change of FONT_DEF
2504 (fs_query_fontset): Check NAME by Fassoc too.
2505 (Fset_fontset_font): Allow non-XLFD font name.
2506 (Ffontset_info): Adjusted for the change of FONT_DEF format.
2508 * fontset.h (face_for_char): Prototype adjusted.
2510 * xdisp.c (face_before_or_after_it_pos): Call FACE_FOR_CHAR with
2511 POS and OBJECT args.
2512 (get_next_display_element): Likewise.
2513 (append_space): Likewise.
2514 (extend_face_to_end_of_line): Likewise.
2515 (get_char_face_and_encoding): Likewise.
2516 (BUILD_COMPOSITE_GLYPH_STRING): Likewise.
2517 (x_produce_glyphs): Likewise.
2519 * xfaces.c (compute_char_face): Call FACE_FOR_CHAR with
2520 POS and OBJECT args.
2522 * xterm.c (x_set_mouse_face_gc): Call FACE_FOR_CHAR with
2523 POS and OBJECT args.
2525 2004-01-03 Jason Rumney <jasonr@gnu.org>
2527 * w32select.c (Fw32_set_clipboard_data): Avoid potential realloc
2528 of GlobalAlloc'ed memory.
2530 2003-12-29 Kenichi Handa <handa@m17n.org>
2532 * ccl.c (Fccl_execute_on_string): Fix the condition of loop.
2534 * charset.h (charset_table_used): Delete extern.
2536 * charset.c (charset_table_used): Make it static.
2537 (map_charset_chars): Fix args to c_function with.
2539 * chartab.c (map_sub_char_table_for_charset): Fix args to
2542 * coding.h (enum coding_result_code): Delete
2543 CODING_RESULT_INSUFFICIENT_CMP, add CODING_RESULT_INVALID_SRC.
2545 * coding.c (Qinsufficient_source, Qinconsistent_eol)
2546 (Qinvalid_source, Qinterrupted, Qinsufficient_memory): New
2548 (Vlast_code_conversion_error): New variables.
2549 (syms_of_coding): DEFSYM or DEFVAR_LISP them.
2550 (ONE_MORE_BYTE): Record error if any instead of signaling an
2551 error. If non-ASCII multibyte char is found, return the negative
2552 value of the code. All callers changed to check it.
2553 (ONE_MORE_BYTE_NO_CHECK): Likewise.
2554 (record_conversion_result): New function. All codes setting
2555 coding->result are changed to call this function.
2556 (detect_coding_utf_8): Don't use the local variable incomplete.
2557 (decode_coding_utf_8): Likewise.
2558 (emacs_mule_char): Change the second arg to `const'.
2559 (detect_coding_emacs_mule): Don't use the local variable
2561 (detect_coding_sjis): Likewise.
2562 (detect_coding_big5): Likewise.
2563 (decode_coding): Fix of flushing out unprocessed data.
2564 (make_conversion_work_buffer): Fix making of a work buffer.
2565 (decode_coding_object): Return coding->dst_object;
2567 * fontset.c (set_fontset_font): Fix args.
2569 * lisp.h (CHARACTERBITS): Define as 22.
2571 * process.c (send_process): Be sure to set coding->src_multibyte.
2573 * xdisp.c (handle_auto_composed_prop): Fix setting of limit.
2575 2003-12-02 Kenichi Handa <handa@m17n.org>
2577 * xdisp.c (handle_auto_composed_prop): Give limit to
2578 Fnext_single_char_property_change.
2580 2003-12-02 Kenichi Handa <handa@m17n.org>
2582 * coding.c (detect_coding): Fix previous change.
2583 (detect_coding_system): Likewise.
2585 2003-12-02 Kenichi Handa <handa@m17n.org>
2587 * composite.c (syms_of_composite): Don't make the compostion hash
2590 * fontset.c (Fset_fontset_font): Fix docstring.
2592 * lisp.h (detect_coding_system): Adjust prototype.
2594 * fileio.c (kill_workbuf_unwind): Delete this function.
2595 (Finsert_file_contents): Adjust the call of detect_coding_system.
2596 Get conversion_buffer by code_conversion_save. Use the macor
2597 CODING_MAY_REQUIRE_DECODING. After decoding, update
2600 * coding.h (make_conversion_work_buffer): Delete extern.
2601 (code_conversion_save): Extern it.
2603 * coding.c (enum iso_code_class_type): Delete ISO_carriage_return.
2604 (CODING_GET_INFO): Delete argument eol_type. Callers changed.
2605 (decode_coding_utf_8): Don't do eol converion.
2606 (detect_coding_utf_16): Check coding->src_chars, not
2607 coding->src_bytes. Add heuristics for those that have no
2609 (decode_coding_emacs_mule): Don't do eol converion.
2610 (decode_coding_iso_2022): Likewise.
2611 (decode_coding_sjis): Likewise.
2612 (decode_coding_big5): Likewise.
2613 (decode_coding_charset): Likewise.
2614 (adjust_coding_eol_type): Return a new coding system.
2615 (detect_coding): Don't detect eol. Fix for utf-16 detection.
2616 (decode_eol): In case of CRLF->LF conversion, use del_range_2 on
2618 (decode_coding): Pay attention to undo_list. Do eol convesion for
2619 all types of coding-systems (if necessary).
2620 (Vcode_conversion_work_buf_list): Delete it.
2621 (Vcode_conversion_reused_workbuf): Renamed from
2622 Vcode_conversion_reused_work_buf.
2623 (Vcode_conversion_workbuf_name): New variable.
2624 (reused_workbuf_in_use): New variable.
2625 (make_conversion_work_buffer): Delete the arg DEPTH.
2626 (code_conversion_restore): Argument changed to cons.
2627 (code_conversion_save): Delete the argument BUFFER. Callers
2629 (detect_coding_system): New argument src_chars. Callers changed.
2630 Fix for utf-16 detection.
2631 (init_coding_once): Don't use ISO_carriage_return.
2632 (syms_of_coding): Initialized Vcode_conversion_workbuf_name and
2633 reused_workbuf_in_use.
2635 2003-11-24 Kenichi Handa <handa@m17n.org>
2637 * keymap.c (store_in_keymap): Pay attention to the case that idx
2638 is a cons specifying a character range.
2640 * coding.c (Fdefine_coding_system_internal): Fix previous change.
2642 2003-11-23 Kenichi Handa <handa@m17n.org>
2644 * xdisp.c (handle_auto_composed_prop): Fix the case of returning
2645 HANDLED_RECOMPUTE_PROPS.
2647 * coding.c (Fdefine_coding_system_internal): Fix checking of
2648 ascii compatibility.
2650 2003-11-22 Kenichi Handa <handa@m17n.org>
2652 * charset.c (find_charsets_in_text): Delete unused locale
2654 (Fset_charset_priority): Update Vemacs_mule_charset_list too.
2656 * coding.c (encode_coding_emacs_mule): Emit bytes with MSB.
2657 Resync charset_list to Vemacs_mule_charset_list.
2659 * keymap.c (store_in_keymap): Pay attention to the case that idx
2660 is a cons specifying a character range.
2662 2003-11-18 Kenichi Handa <handa@m17n.org>
2664 * composite.c (update_compositions): Bind inhibit-read-only, etc
2665 to t before calling remove-list-of-text-properties.
2667 * print.c (print_object): Always print ASCII chars as is.
2669 2003-11-17 Kenichi Handa <handa@m17n.org>
2671 * keymap.c (Fdefine_key): Fix handling of Lucid style event type
2674 * fns.c (Fmapconcat): Signal an error if SEQUENCE is a char table.
2675 (Fmapcar): Likewise.
2678 2003-11-15 Kenichi Handa <handa@m17n.org>
2680 * syntax.c (skip_chars): Be sure to alloca char_ranges when
2683 2003-11-14 Kenichi Handa <handa@m17n.org>
2685 * xfaces.c (set_lface_from_font_name): Fix for the case that
2686 FONTNAME is not fontset name.
2688 2003-11-13 Kenichi Handa <handa@m17n.org>
2690 * fns.c (base64_encode_1): Fix previous change.
2692 2003-11-08 Kenichi Handa <handa@m17n.org>
2694 * fontset.c (set_fontset_font): New function.
2695 (Fset_fontset_font): If a font is specified for a charset, use
2696 map_charset_chars to store the font spec in a fontset.
2698 2003-10-29 Kenichi Handa <handa@m17n.org>
2700 * fontset.c (fontset_face): Create a fallback fontset on demand
2701 (make_fontset): Don't create a fallback fontset here.
2702 (free_face_fontset): Free a fallback fontset (if any) too.
2703 (n_auto_fontsets): Delete this variable.
2704 (auto_fontset_alist): New variable.
2705 (new_fontset_from_font_name): Check auto_fontset_alist.
2706 (dump_fontset) [FONTSET_DEBUG]: Fully re-written.
2707 (Ffontset_list_all) [FONTSET_DEBUG]: New function.
2708 (syms_of_fontset): Initialize and staticpro auto_fontset_alist.
2709 Defsubr Sfontset_list_all.
2711 2003-10-24 Kenichi Handa <handa@m17n.org>
2713 * xterm.c (x_list_fonts): Fix excluding of auto-scaled fonts.
2715 2003-10-23 Kenichi Handa <handa@m17n.org>
2717 * fontset.c (Fnew_fontset): Check NAME more rigidly.
2719 2003-10-17 Kenichi Handa <handa@m17n.org>
2721 * editfns.c (Fgoto_char): Fix docstring.
2723 2003-10-16 Kenichi Handa <handa@m17n.org>
2725 * insdel.c (insert_from_gap): Adjust intervals correctly.
2727 2003-10-12 Jason Rumney <jasonr@gnu.org>
2729 * w32term.c (GLYPHSET, WCRANGE): Define if system headers don't.
2730 (pfnGetFontUnicodeRanges): New dynamically loaded function.
2731 (w32_initialize): Try to load it.
2732 (x_get_font_repertory): Use it if available.
2733 (w32_encode_char): Add shortcut for unicode output.
2735 * w32fns.c (w32_load_system_font): Default charset to -1.
2736 (x_to_w32_charset): Match all fonts for unicode.
2737 (w32_to_x_charset): New parameter matching. Don't return partial
2738 or wildcard charsets.
2739 (w32_to_all_x_charsets): Don't return partial or wildcard charsets.
2740 (w32_codepage_for_font): Return CP_UNICODE for unicode.
2741 (w32_to_x_font): Match charset to real charset.
2742 (enum_font_cb2): Always list unicode versions.
2744 * makefile.w32-in (temacs): Increase EMHEAP.
2746 2003-10-11 Jason Rumney <jasonr@gnu.org>
2748 * w32term.c (w32_encode_char): New charset parameter.
2749 font_info.encoding becomes encoding_type.
2750 (x_get_font_repertory): New function. Warning: stub only!
2751 (x_new_font): Return quickly if font already set.
2752 (x_new_fontset): fontsetname parameter is Lisp_Object.
2753 Use new fs_query_fontset. Try new_fontset_from_font_name. Use
2754 fontset_name for return value.
2756 * w32term.h: Declare x_get_font_repertory.
2758 * w32select.c (Fw32_set_clipboard_data): Use string_x_string_p in
2759 place of find_charset_in_text. Use encode_coding_object in place
2761 (Fw32_get_clipboard_data): Use decode_coding_c_string in place of
2764 * w32fns.c (Fx_create_frame, x_create_tip_frame): Use new version
2766 (w32_load_system_font): Initialize charset as unicode.
2767 font_info.encoding becomes encoding_type.
2768 (w32_to_x_font): Use decode_coding_c_string in place of
2770 (x_to_w32_font): Use encode_coding_object in place of
2772 (syms_of_w32fns): Set get_font_repertory_func.
2774 * w32console.c: Include character.h. Use terminal_encode_buffer
2776 (write_glyphs): Use new version of encode_terminal_code. Use
2777 encode_coding_object in place of encode_coding.
2779 * w32bdf.c (w32_load_bdf_font): Clear font_info before filling.
2780 encoding becomes encoding_type.
2782 * term.c (terminal_encode_buffer): Make externally visible.
2784 * makefile.w32-in: Add character.h dependancies.
2785 (character.o, chartab.o): New targets.
2787 2003-10-10 Kenichi Handa <handa@m17n.org>
2789 * fileio.c (Finsert_file_contents) [DOS_NT]: Use the macro
2790 CODING_ID_EOL_TYPE..
2792 2003-10-07 Andreas Schwab <schwab@suse.de>
2794 * coding.c (produce_chars): Revert last change.
2796 2003-10-06 Kenichi Handa <handa@m17n.org>
2798 * charset.h (charset_unicode): Extern it.
2800 * charset.c (string_xstring_p): Check by (C >= 0x100).
2801 (find_charsets_in_text): Format of the arc CHARSETS changed. New
2803 (Ffind_charset_region, Ffind_charset_string): Adjusted for the
2804 change of find_charsets_in_text.
2805 (Fsplit_char): Fix doc. Never return unknown.
2807 * chartab.c (char_table_translate): Use CHARACTERP, not INETEGERP.
2809 * coding.c (Fdefine_coding_system_alias): Update
2810 Vcoding_system_list.
2812 * fontset.c (load_font_get_repertory): Pay attention to the case
2813 that ENCODING of a font is specified by a char-table.
2815 * xterm.c (x_get_font_repertory): Handle the case that the
2816 encoding of font is other than Unicode.
2818 2003-10-02 Kenichi Handa <handa@m17n.org>
2820 * term.c (encode_terminal_code): Don't handle glyph-table. Check
2821 if a character is encodable by the terminal coding system. If
2822 not, produces proper number of `?'s. Update
2823 terminal_encode_buffer and terminal_encode_buf_size if necessary.
2824 (produce_glyphs): Check by CHAR_BYTE8_P, not SINGLE_BYTE_CHAR_P.
2826 2003-10-01 Kenichi Handa <handa@m17n.org>
2828 * term.c (terminal_encode_buffer, terminal_encode_buf_size): New
2830 (encode_terminal_code): Argument changed. Encode multiple
2831 characters at once. Store the result of encoding in
2832 terminal_encode_buffer.
2833 (write_glyphs): Adjusted for the change of encode_terminal_code.
2834 (insert_glyphs): Likewise.
2835 (term_init): Initialize terminal_encode_buffer and
2836 terminal_encode_buf_size.
2838 * coding.c (consume_chars): If coding->src_object is nil, don't
2841 2003-09-30 Kenichi Handa <handa@m17n.org>
2843 * character.c (char_string): Use ASCII_CHAR_P instead of
2846 2003-09-30 Kenichi Handa <handa@m17n.org>
2848 * xdisp.c (handle_auto_composed_prop): Check if the last
2849 characters of auto-composed region is newly composed with the
2850 following characters.
2851 (handle_composition_prop): Fix checking of point being inside
2854 2003-09-26 Kenichi Handa <handa@m17n.org>
2856 * fns.c (concat): Don't change multibyteness of the result by
2857 concatenating an 8-bit character.
2859 * data.c (Faset): Check newelt by CHECK_CHARACTER. Don't change
2860 multibyteness of the result when newelt is an 8-bit character.
2862 2003-09-29 Dave Love <fx@gnu.org>
2864 * xmenu.c (find_and_call_menu_selection): Make menu_bar_items_used
2867 * xfns.c (DefaultDepthOfScreen, x_encode_text): Remove unused vars.
2869 * xfaces.c (face_numeric_value): Declare dim size_t.
2870 (Finternal_lisp_face_equal_p): Remove unused f.
2872 * xdisp.c (BUILD_CHAR_GLYPH_STRINGS, display_and_set_cursor)
2873 (MATRIX_ROW): Remove unused vars.
2874 (draw_glyphs, x_insert_glyphs, fast_find_position)
2875 (fast_find_position, fast_find_string_pos): Use EMACS_INT for
2878 * regex.c (regex_compile): Remove unused var.
2880 * minibuf.c (Fminibuffer_complete_word): Remove unused var.
2882 * keymap.c (Fset_keymap_parent, map_keymap, Fcopy_keymap)
2883 (Faccessible_keymaps, where_is_internal): Remove unused vars.
2885 * keyboard.c (cancel_hourglass_unwind): Return Qnil.
2887 * frame.c (frame_name_fnn_p): Make len EMACS_INT.
2889 * fileio.c (Fwrite_region): Remove unused var.
2891 * dispnew.c (adjust_frame_glyphs_for_frame_redisplay)
2892 (adjust_frame_glyphs_for_window_redisplay): Remove unused ch_dim.
2894 * composite.c (Fremove_list_of_text_properties): Declare.
2896 * coding.c (inhibit_pre_post_conversion): Removed (unused).
2897 (alloc_destination, produce_chars): Use EMACS_INT for byte/char
2899 (coding_inherit_eol_type): Remove unused attrs.
2900 (detect_coding): Cast arg of detect_eol.
2902 * charset.c (syms_of_charset): Remove unused var p.
2903 (find_charsets_in_text, Ffind_charset_region): Use EMACS_INT for
2906 * casetab.c (set_case_table): Remove unused var.
2908 * window.c (Fdisplay_buffer, Fframe_selected_window): Remove
2911 2003-09-26 Dave Love <fx@gnu.org>
2913 * xterm.c (x_bitmap_mask): Declare.
2915 2003-09-17 Dave Love <fx@gnu.org>
2917 * xterm.c (x_term_init): Fix type error.
2919 * lisp.h: Add Funibyte_char_to_multibyte.
2921 * coding.c (Fread_coding_system): Fix arg of XSETSTRING.
2922 (Fset_coding_system_priority): Doc fix.
2924 * alloc.c: Sync with HEAD version.
2926 * ccl.c (ccl_driver): Fix arg of CHARACTERP.
2928 * indent.c (check_composition): Make start and end EMACS_INT.
2930 * character.c (lisp_string_width): Make ignore and end EMACS_INT.
2932 * xdisp.c (handle_composition_prop, check_point_in_composition):
2933 Make buffer positions EMACS_INT.
2935 * composite.c (find_composition, run_composition_function)
2936 (update_compositions, Ffind_composition_internal): Make buffer
2937 positions EMACS_INT.
2939 * composite.h (find_composition, update_compositions): Make
2940 position args EMACS_INT.
2942 * keyboard.c (adjust_point_for_property): Make beg and end
2945 * intervals.c (get_property_and_range):
2946 * intervals.h (get_property_and_range): Make start and end EMACS_INT.
2948 * unexalpha.c: Don't include varargs.h.
2950 2003-09-16 Dave Love <fx@gnu.org>
2952 * coding.h (ENCODE_UTF_8): New.
2954 * Makefile.in (gtkutil.o): Depend on coding.h.
2956 * coding.c (Fset_coding_system_priority): Doc fix.
2958 2003-09-16 Kenichi Handa <handa@m17n.org>
2960 * fileio.c (Finsert_file_contents): Call setup_coding_system in
2961 the case of auto saving.
2963 2003-09-10 Andreas Schwab <schwab@suse.de>
2965 * chartab.c (map_char_table): Protect `range' from GC.
2966 (map_char_table_for_charset): Likewise.
2968 2003-07-09 Kenichi Handa <handa@m17n.org>
2970 * coding.c (decode_coding_sjis): Check bytes more rigidly.
2972 2003-06-26 Kenichi Handa <handa@m17n.org>
2974 * fileio.c (choose_write_coding_system): Return a decided coding
2976 (Fwrite_region): Set Vlast_coding_system_used to the return value
2977 of choose_write_coding_system.
2979 2003-06-06 Kenichi Handa <handa@m17n.org>
2981 * charset.c (Fset_charset_priority): Pay attention to duplicated
2984 * coding.c (QCcategory): New variable.
2985 (syms_of_coding): Defsym it. Set all elements of
2986 Vcoding_category_table and their symbol values.
2987 (Fset_coding_system_priority): Doc fix. Update symbol qvalues of
2988 coding-category-XXX, and coding-category-list.
2989 (Fdefine_coding_system_internal): Add category in the plist.
2991 2003-06-05 Kenichi Handa <handa@m17n.org>
2993 * callproc.c (Fcall_process): Handle carryover correctly.
2995 * coding.c (decode_coding_iso_2022): Fix handling of invalid
2997 (raw_text_coding_system): Check NILP (coding_system).
2998 (coding_inherit_eol_type): Check NILP (coding_system) and
3000 (consume_chars): Fix for the case of raw-text.
3002 * process.c (read_process_output): Handle carryover correctly.
3004 2003-06-02 Dave Love <fx@gnu.org>
3006 * regex.c (re_search_2): Fix last change.
3008 2003-05-30 Kenichi Handa <handa@m17n.org>
3010 * regex.c (GET_CHAR_BEFORE_2): Check multibyte, not
3011 target_multibyte. Even in a unibyte case, return a converted
3013 (GET_CHAR_AFTER): New macro.
3014 (PATFETCH): Translate via multibyte char.
3015 (HANDLE_UNIBYTE_RANGE): Delete this macro.
3016 (SETUP_MULTIBYTE_RANGE): New macro.
3017 (regex_compile): Setup compiled code so that its multibyteness
3018 matches that of a target. Fix the handling of "[X-YZ]" using
3019 SETUP_MULTIBYTE_RANGE.
3020 (analyse_first) <charset>: For filling fastmap for all multibyte
3021 characters, don't check by BASE_LEADING_CODE_P.
3022 (re_search_2): Don't check RE_TARGET_MULTIBYTE_P (bufp). It is
3023 the same as RE_MULTIBYTE_P (bufp) now.
3024 (mutually_exclusive_p): Check by (! multibyte ||
3026 (TARGET_CHAR_AND_LENGTH): Delete this macro.
3027 (TRANSLATE_VIA_MULTIBYTE): New macro.
3028 (re_match_2_internal): Don't check RE_TARGET_MULTIBYTE_P (bufp).
3029 It is the same as RE_MULTIBYTE_P (bufp) now.
3030 <exactn>: Translate via multibyte.
3031 <anychar>: Fetch a character by RE_STRING_CHAR_AND_LENGTH. Don't
3033 <charset, charset_not>: Fetch a character by
3034 RE_STRING_CHAR_AND_LENGTH. Translate via multibyte.
3035 <duplicate>: Call bcmp_translate with the last arg `multibyte'.
3036 <wordbound, notwordbound, wordbeg, wordend, syntaxspec,
3037 notsyntaxspec, categoryspec, notcategoryspec> Fetch a character
3039 (bcmp_translate): Likewise.
3041 * search.c (compile_pattern): Check the member target_multibyte,
3042 not the member multibyte of buf.
3044 * lread.c (read1): While reading a string, set force_singlebyte
3045 and force_multibyte correctly.
3047 * charset.c (Fset_unibyte_charset): Fix setting up of
3048 unibyte_to_multibyte_table.
3049 (init_charset_once): Likewise.
3051 2003-05-29 Kenichi Handa <handa@m17n.org>
3053 * coding.c (setup_coding_system): If coding has
3054 post-read-conversion or pre-write-conversion, set
3055 CODING_REQUIRE_DECODING_MASK and CODING_REQUIRE_ENCODING_MASK
3057 (decode_coding_gap): Run post-read-conversion if any.
3059 * fileio.c (Finsert_file_contents): Even if we read into a
3060 unibyte buffer, check if we must decode the result or not.
3062 2003-05-29 Kenichi Handa <handa@m17n.org>
3064 * coding.c (make_conversion_work_buffer): Change the work buffer
3065 name to the same one as that of Emacs 21.
3067 2003-05-28 Kenichi Handa <handa@m17n.org>
3069 * coding.h (make_conversion_work_buffer): Prototype adjusted.
3070 (code_conversion_restore): Don't extern it.
3072 * coding.c (detected_mask): Delete unused variable.
3073 (decode_coding_iso_2022): Pay attention to the byte sequence of
3074 CTEXT extended segment, and retain those bytes as is.
3075 (decode_coding_ccl): Delete unused variable `valids'.
3076 (setup_coding_system): Delete unused variable `category'.
3077 (consume_chars): Delete unused variable `category'. Make it work
3078 for non-multibyte case.
3079 (make_conversion_work_buffer): Argument changed.
3080 (saved_coding): Delete unused variable.
3081 (code_conversion_restore): Don't check saved_coding->destination.
3082 (code_conversion_save): New function.
3083 (decode_coding_gap, encode_coding_gap): Call code_conversion_save
3084 instead of record_unwind_protect.
3085 (decode_coding_object, encode_coding_object): Likewise. Recover
3087 (detect_coding_system): Delete unused variable `mask'.
3088 (Fdefine_coding_system_internal): Delete unsed vaiable id;
3090 * fileio.c (kill_workbuf_unwind): New function.
3091 (Finsert_file_contents): On replacing, call
3092 make_conversion_work_buffer with correct args, and call
3093 record_unwind_protect with the first arg kill_workbuf_unwind.
3095 * lisp.h (Fgenerate_new_buffer_name): EXFUN it.
3097 2003-05-20 Kenichi Handa <handa@m17n.org>
3099 * fontset.c (BASE_FONTSET_P): Check FONTSET_BASE, not
3101 (fontset_add): Fix for the case that TO is less than TO1.
3102 (Ffontset_info): Don't use fallback fontset on checking the
3104 (dump_fontset): New function for debugging.
3106 * coding.c (Fdefine_coding_system_internal): Fix for the case that
3107 coding_type is Qcharset.
3109 2003-05-07 Kenichi Handa <handa@m17n.org>
3111 * chartab.c (map_sub_char_table): New argument DEFAULT_VAL.
3112 (map_char_table): Don't inherit the value from the parent on
3113 initializing VAL. Adjusted for the above change.
3115 2003-05-06 Kenichi Handa <handa@m17n.org>
3117 * coding.c (Qsignature, Qendian): Delete these variables.
3118 (syms_of_coding): Don't initialize them.
3119 (CATEGORY_MASK_UTF_16_AUTO): New macro.
3120 (detect_coding_utf_16): Add CATEGORY_MASK_UTF_16_AUTO in
3122 (decode_coding_utf_16): Don't detect BOM here.
3123 (encode_coding_utf_16): Produce BOM if CODING_UTF_16_BOM (coding)
3124 is NOT utf_16_without_bom.
3125 (setup_coding_system): For a coding system of type utf-16, check
3126 if the attribute :endian is Qbig or not (not nil or not), and set
3127 CODING_REQUIRE_DETECTION_MASK if BOM detection is required.
3128 (detect_coding): If coding type is utf-16 and BOM detection is
3129 required, detect it.
3130 (Fdefine_coding_system_internal): For a coding system of type
3131 utf-16, check if the attribute :endian is Qbig or not (not nil or
3134 2003-05-06 Kenichi Handa <handa@m17n.org>
3136 * coding.c (coding_set_source): Fix for the case that the current
3137 buffer is different from coding->src_object.
3138 (decode_coding_object): Don't use the conversion work buffer if
3139 DST_OBJECT is a buffer.
3141 2003-05-04 Dave Love <fx@gnu.org>
3143 * lread.c (read_emacs_mule_char) [len==2]: Index
3144 emacs_mule_charset correctly.
3146 2003-02-16 Dave Love <fx@gnu.org>
3148 * coding.c (Qbig5, Vbig5_coding_system, CATEGORY_MASK_BIG5)
3149 (detect_coding_big5, decode_coding_big5, encode_coding_big5)
3150 (Fdecode_big5_char, Fencode_big5_char): Deleted. (Big5 no longer
3152 (setup_coding_system, coding_category, CATEGORY_MASK_ANY)
3153 (detected_mask): Remove Big5 bits.
3155 2003-04-09 Kenichi Handa <handa@m17n.org>
3157 The following changes are to make the font rescaling facility
3158 compatible with Emacs 21.
3160 * xfaces.c (Vface_font_rescale_alist): Renamed from
3161 Vface_resizing_fonts.
3162 (struct font_name): Rename member resizing_ratio to rescale_ratio.
3163 (font_rescale_ratio): Renamed from font_resizing_ratio.
3164 (split_font_name): Set font->rescale_ratio.
3165 (better_font_p): Pay attention to font->rescale_ratio.
3166 (build_scalable_font_name): Likewise. Change RESX, and RESY
3168 (syms_of_xfaces): Declare Vface_font_rescale_alist as a Lisp
3171 2003-03-28 Kenichi Handa <handa@m17n.org>
3173 * coding.c (Qutf_16_be_nosig, Qutf_16_be, Qutf_16_le_nosig)
3174 (Qutf_16_le): Remove these variables.
3175 (syms_of_coding): Don't DEFSYM them.
3176 (decode_coding_utf_16): Fix handling of BOM.
3177 (encode_coding_utf_16): Fix handling of BOM.
3179 2003-03-14 Kenichi Handa <handa@m17n.org>
3181 * fileio.c (Finsert_file_contents): On replacing, before decoding
3182 the file into the work buffer, set point of the work buffer to the
3185 2003-02-13 Dave Love <fx@gnu.org>
3187 * coding.c (Fcheck_coding_systems_region): Fix type errors.
3189 2003-02-04 Dave Love <fx@gnu.org>
3191 * xterm.c (XTread_socket): Check Lisp types for Vx_keysym_table
3194 2003-01-31 Kenichi Handa <handa@m17n.org>
3196 * xdisp.c (SKIP_GLYPHS): New macro.
3197 (set_cursor_from_row): Pay attention to string display properties.
3199 * category.c (copy_category_entry): Fix for the case that RANGE
3202 * xterm.c (x_encode_char): Call ccl_driver with the last arg Qnil.
3204 * w32term.c (w32_encode_char): Call ccl_driver with the last arg
3207 2003-01-30 Kenichi Handa <handa@m17n.org>
3209 * charset.c (Fcharset_id_internal): New function.
3210 (syms_of_charset): Defsubr it.
3212 * coding.c (decode_coding_ccl, encode_coding_ccl): Call ccl_driver
3213 with the last arg charset_list acquired from coding.
3214 (Fdefine_coding_system_internal): For ccl-based coding system, fix
3215 the attribute coding_attr_ccl_valids.
3217 * coding.h (enum define_coding_ccl_arg_index): Set the first
3218 member coding_arg_ccl_decoder to coding_arg_max.
3220 * ccl.h (ccl_driver): Prototype adjusted.
3222 * ccl.c (CCL_DECODE_CHAR, CCL_ENCODE_CHAR): New macros.
3223 (ccl_driver): New arg CHARSET_LIST. Use the above macros instead
3224 of DECODE_CAHR, ENCODE_CHAR, CHAR_CHARSET.
3225 (Fccl_execute): Call ccl_driver with the last arg Qnil.
3226 (Fccl_execute_on_string): Likewise.
3228 2003-01-11 Kenichi Handa <handa@m17n.org>
3230 * charset.h (ENCODE_CHAR): If the method is SUBSET or SUPERSET,
3233 * charset.c (encode_char): Fix handling of methods SUBSET and
3236 * xterm.c (x_new_fontset): Fix previous change.
3238 2003-01-10 Dave Love <fx@gnu.org>
3240 * composite.c (syms_of_composite): Make composition_hash_table
3243 2003-01-10 Kenichi Handa <handa@m17n.org>
3245 * dispextern.h (check_face_attributes, generate_ascii_font_name)
3246 (font_name_registry): Don't extern them.
3247 (split_font_name_into_vector, build_font_name_from_vector): Extern
3250 * fontset.h (Qfontset): Don't extern it.
3251 (new_fontset_from_font_name): Extern it.
3253 * fontset.c: Give 8 extra slots to fontset objects.
3254 (Qfontset_info): New variable.
3255 (syms_of_fontset): Defsym it.
3256 (FONTSET_FALLBACK): New macro.
3257 (fontset_face): Try also the default fontset.
3258 (make_fontset): Realize a fallback fontset from the default
3260 (generate_ascii_font_name): Moved from xfaces.c. Rewritten by
3261 using split_font_name_into_vector and build_font_name_from_vector.
3262 (Fset_fontset_font): Access the elements of font_spec by enum
3263 FONT_SPEC_INDEX. If font_spec is a string, extract the registry
3264 name by using split_font_name_into_vector.
3265 (Fnew_fontset): If no ASCII font is specified in FONTLIST,
3266 generate a proper font name from the fontset name. Update
3267 Vfontset_alias_alist.
3268 (n_auto_fontsets): New variable.
3269 (new_fontset_from_font_name): New function.
3270 (Ffont_info): Store the information about fonts generated from the
3271 default fontset in the first extra slot of the returned
3274 * xfaces.c (generate_ascii_font_name): Moved to fontset.c.
3275 (font_name_registry): Function deleted.
3276 (split_font_name_into_vector): New function.
3277 (build_font_name_from_vector): New function.
3278 (font_list): The argument REGISTRY is now a list of registry
3280 (choose_face_font): If we are choosing an ASCII font, and ATTRS
3281 specifies an explicit font name, return the name as is. Make a
3282 list of registy names.
3284 * xfns.c (x_set_font, x_create_tip_frame): Adjusted to the change
3286 (Fx_create_frame): Don't call x_new_fontset here. Just use
3287 x_list_fonts to check the existence of fonts.
3289 * xterm.h (x_new_fontset): Prototype adjusted.
3291 * xterm.c (x_new_fontset): Change the arg FONTSETNAME to Lisp
3292 string. Use new_fontset_from_font_name to create a fontset from a
3295 2003-01-07 Dave Love <fx@gnu.org>
3297 * Makefile.in: Fix some dependencies.
3299 * keymap.c (Fapropos_internal): Don't gcpro apropos_predicate but
3300 set it to nil before returning.
3302 * composite.c (update_compositions): Fix type error.
3304 * syntax.c (skip_chars, skip_syntaxes): Fix type errors.
3306 2003-01-07 Kenichi Handa <handa@m17n.org>
3308 * xterm.c (x_new_font): Optimize for the case that the font is
3309 already set for the frame.
3311 2003-01-06 Kenichi Handa <handa@m17n.org>
3313 * chartab.c (char_table_ascii): Check if the char table contents
3314 is sub-char-table or not.
3315 (char_table_set): Fix argument to char_table_ascii.
3316 (char_table_set_range): Likewise.
3318 * coding.c (CATEGORY_MASK_RAW_TEXT): New macro.
3319 (detect_coding_utf_8, detect_coding_utf_16)
3320 (detect_coding_emacs_mule, detect_coding_iso_2022)
3321 (detect_coding_sjis, detect_coding_big5)
3322 (detect_coding_ccl, detect_coding_charset): Change argument MASK
3323 to DETECT_INFO. Update DETECT_INFO and return 1 if the byte
3324 sequence is valid in this coding system. Callers changed.
3325 (MAX_ANNOTATION_LENGTH): New macro.
3326 (ADD_ANNOTATION_DATA): New macro.
3327 (ADD_COMPOSITION_DATA): Argument changed. Callers changed. Call
3328 ADD_ANNOTATION_DATA. The format of annotation data changed.
3329 (ADD_CHARSET_DATA): New macro.
3330 (emacs_mule_char): New argument ID. Callers changed.
3331 (decode_coding_emacs_mule, decode_coding_iso_2022)
3332 (decode_coding_sjis, decode_coding_big5, decode_coding_charset):
3333 Produce charset annotation data in coding->charbuf.
3334 (encode_coding_emacs_mule, encode_coding_iso_2022): Pay attention
3335 to charset annotation data in coding->charbuf.
3336 (setup_coding_system): Add CODING_ANNOTATE_CHARSET_MASK
3337 coding->common_flags if the coding system is iso-2022 based and
3339 (produce_composition): Adjusted for the new annotation data
3341 (produce_charset): New function.
3342 (produce_annotation): Handle charset annotation.
3343 (handle_composition_annotation, handle_charset_annotation): New
3345 (consume_chars): Handle charset annotation. Utilize the above two
3347 (encode_coding_object): If SRC_OBJECT and DST_OBJECT are the same
3348 buffer, get the deleted text as a string and set
3349 coding->src_object to that string.
3350 (detect_coding, detect_coding_system): Use the new struct
3351 coding_detection_info.
3353 * coding.h (struct coding_detection_info): New structure.
3354 (struct coding_system): Prototype of the member `detector'
3356 (CODING_ANNOTATE_CHARSET_MASK): New macro.
3358 2003-01-06 Kenichi Handa <handa@m17n.org>
3360 * insdel.c (insert_from_gap): Fix argument to offset_intervals.
3362 2003-01-03 Dave Love <fx@gnu.org>
3364 * keymap.c (apropos_predicate, apropos_accumulate): Declare
3366 (Fapropos_internal): Don't gcpro apropos_accumulate. Set result
3367 to new local and nullify apropos_accumulate before returning.
3368 (syms_of_keymap): Staticpro and initialize apropos_accumulate.
3370 2002-12-05 Kenichi Handa <handa@m17n.org>
3372 * charset.c (Fdefine_charset_internal): Setup charset.fast_map
3375 2002-11-26 Dave Love <fx@gnu.org>
3377 * fns.c (Flanginfo): Call synchronize_system_time_locale.
3379 2002-11-07 Kenichi Handa <handa@m17n.org>
3381 The following changes are to make character composition happen
3382 automatically on displaying.
3384 * Makefile.in (lisp, shortlisp): Add composite.elc
3386 * composite.h (Qauto_composed, Vauto_composition_function,
3387 Qauto_composition_function): Extern them.
3389 * composite.c (Vcomposition_function_table,
3390 Qcomposition_function_table): Delete variables.
3391 (Qauto_composed, Vauto_composition_function,
3392 Qauto_composition_function): New variables.
3393 (run_composition_function): Don't call
3394 compose-chars-after-function.
3395 (update_compositions): Clear `auto-composed' text property.
3396 (compose_chars_in_text): Delete this function.
3397 (syms_of_composite): Staticpro Qauto_composed and
3398 Qauto_composition_function. Declare Vauto_composition_function as
3401 * dispextern.h (enum prop_idx): Add member AUTO_COMPOSED_PROP_IDX.
3403 * xdisp.c (it_props): Add an entry for Qauto_composed.
3404 (handle_auto_composed_prop): New function.
3406 * xselect.c (selection_data_to_lisp_data): Don't call
3407 compose_chars_in_text.
3409 2002-11-06 Dave Love <fx@gnu.org>
3411 * keyboard.c (read_char): Modify checking around use of
3412 Vkeyboard_translate_table.
3414 * xterm.c (XTread_socket): Check Lisp types for Vx_keysym_table
3417 2002-11-06 Kenichi Handa <handa@m17n.org>
3419 * coding.c (decode_coding_utf_8): When eol_type is Qdos, handle
3420 the case that the last byte is '\r' correctly.
3421 (decode_coding_emacs_mule): Likewise.
3422 (decode_coding_iso_2022): Likewise.
3423 (decode_coding_sjis): Likewise.
3424 (decode_coding_big5): Likewise.
3425 (decode_coding_charset): Likewise.
3426 (produce_chars): Likewise.
3427 (decode_coding): Flushing out the unprocessed data correctly.
3428 (decode_coding_gap): Set CODING_MODE_LAST_BLOCK bit of
3431 2002-10-31 Dave Love <fx@gnu.org>
3433 * xterm.c (XTread_socket): Fix changes for defined keysyms. Add
3435 (xaw_scroll_callback): Revert last change.
3437 2002-10-30 Kenichi Handa <handa@m17n.org>
3439 * charset.c (Fset_charset_priority): Update
3440 Viso_2022_charset_list.
3442 2002-10-29 Kenichi Handa <handa@m17n.org>
3444 * xfaces.c (Vface_resizing_fonts): New variable.
3445 (struct font_name): New member `resizing_ratio'.
3446 (font_resizing_ratio): New function.
3447 (split_font_name): Set font->resizing_ratio.
3448 (better_font_p): Pay attention to font->resizing_ratio.
3449 (build_scalable_font_name): Likewise. Don't change POINT_SIZE,
3450 RESX, and RESY fields.
3451 (try_alternative_families): Try scalable fonts if
3452 Vscalable_fonts_allowed is not Qt.
3453 (syms_of_xfaces): Declare Vface_resizing_fonts as a Lisp variable.
3455 2002-10-29 Dave Love <fx@gnu.org>
3457 * xterm.c (xaw_scroll_callback): Cast correctly.
3459 2002-10-28 Dave Love <fx@gnu.org>
3461 * keyboard.c (lispy_accent_codes, lispy_accent_keys): Extend.
3462 (lispy_kana_keys): Comment out.
3463 (make_lispy_event) [XK_kana_A]: Comment out.
3465 * xterm.c (xaw_scroll_callback): Cast call_data.
3466 (XTread_socket): Deal with ASCII keysyms.
3467 (syms_of_xterm) <Vx_keysym_table>: Fix args of make_hash_table.
3469 2002-10-27 Dave Love <fx@gnu.org>
3471 * xterm.c (Vx_keysym_table): New.
3472 (syms_of_xterm): Initialize it.
3473 (XTread_socket): Use it.
3474 From head: Eliminate incorrect optimization that tried to avoid
3475 decoding the output of X*LookupString.
3476 (x_get_font_repertory): Delete charset declaration.
3478 2002-10-16 Kenichi Handa <handa@m17n.org>
3480 * coding.c (detect_coding): Fix previous change.
3481 (detect_coding_charset): If only ASCII bytes are found, return 0.
3482 (detect_coding_system): Fix previous change.
3483 (Fdefine_coding_system_internal): Setup
3484 CODING_ATTR_ASCII_COMPAT (attrs) correctly.
3486 2002-10-15 Dave Love <fx@gnu.org>
3488 * coding.c (Fcheck_coding_system): Doc fix.
3490 * editfns.c (Finsert_byte): Return a proper value.
3492 2002-10-14 Kenichi Handa <handa@m17n.org>
3494 * coding.c (decode_coding): Fix args to translate_chars. Pay
3495 attention to Vstandard_translation_table_for_decode.
3496 (encode_coding): Fix args to translate_chars. Pay attention to
3497 Vstandard_translation_table_for_encode.
3499 * data.c (Faset): Check NEWELT by ASCII_CHAR_P, not by
3502 * editfns.c (general_insert_function): Check VAL by ASCII_CHAR_P,
3503 not by SINGLE_BYTE_CHAR_P.
3505 * fns.c (concat): Check CH by ASCII_CHAR_P, not by
3508 * insdel.c (copy_text): Check C by ASCII_CHAR_P, not by
3511 * keymap.c (Ftext_char_description): Check C by ASCII_CHAR_P, not
3512 by SINGLE_BYTE_CHAR_P.
3514 * search.c (Freplace_match): Check C by ASCII_CHAR_P, not by
3517 2002-10-14 Dave Love <fx@gnu.org>
3519 * fns.c (Fstring_as_multibyte, Fstring_to_multibyte): Doc fix.
3521 2002-10-10 Dave Love <fx@gnu.org>
3523 * fns.c (Flanginfo): Fix typo.
3525 * unexelf.c (unexec): Make last change conditional on Irix 6.5.
3527 2002-10-10 Kenichi Handa <handa@m17n.org>
3529 * coding.c (detect_coding_utf_8): Check incomplete byte sequence.
3530 Don't update *mask when correctly detected.
3531 (detect_coding_utf_16): Likewise.
3532 (detect_coding_emacs_mule): Likewise.
3533 (detect_coding_iso_2022): Likewise.
3534 (detect_coding_sjis): Likewise.
3535 (detect_coding_big5): Likewise.
3536 (detect_coding_ccl): Likewise.
3537 (decode_coding_sjis): Fix decoding of katakana-jisx0201.
3538 (detect_eol): Delete the argument CODING, and add the argument
3540 (detect_coding): Adjusted for the changes above.
3541 (detect_coding_system): Likewise.
3543 2002-10-09 Kenichi Handa <handa@m17n.org>
3545 * character.c (char_string): Renamed from
3546 char_string_with_unification. Pay attention to
3548 (string_char): Renamed from string_char.
3550 * character.h (CHAR_STRING): Call char_string if C is greater than
3552 (CHAR_STRING_ADVANCE): Likewise.
3553 (STRING_CHAR): Call string_char instead of
3554 string_char_with_unification.
3555 (STRING_CHAR_AND_LENGTH): Likewise.
3556 (STRING_CHAR_ADVANCE): Likewise.
3558 2002-10-09 Dave Love <fx@gnu.org>
3560 * coding.c (decode_coding_utf_8): Treat surrogates as invalid.
3562 2002-10-07 Kenichi Handa <handa@m17n.org>
3564 * keymap.c (push_key_description): Pay attention to
3567 * regex.c (re_search_2): Fix for the case of unibyte buffer.
3569 2002-10-06 Dave Love <fx@gnu.org>
3571 * charset.c (define_charset_internal): Rename `supprementary'.
3573 * Makefile.in (lisp, shortlisp): Remove latin-N.
3575 2002-10-05 Dave Love <fx@gnu.org>
3577 * xfns.c (x_window, x_window): Use use_xim.
3579 * xterm.c (use_xim): Initialize.
3580 (xim_open_dpy, xim_initialize, xim_close_dpy): Use use_xim.
3581 (x_term_init): Maybe set use_xim.
3583 * xterm.h (use_xim) [HAVE_X_I18N]: Declare.
3585 2002-10-01 Kenichi Handa <handa@m17n.org>
3587 * search.c (search_buffer): Fix case-fold-search of multibyte
3589 (boyer_moore): Rename the last argument to char_high_bits.
3591 2002-09-27 Kenichi Handa <handa@m17n.org>
3593 * xdisp.c (display_string): Fix for the case of zero width glyph.
3595 * xfns.c (x_set_font): Change the error message of the case that
3596 x_new_fontset returns Qt.
3598 * xfaces.c (set_lface_from_font_name): Reject the default fontset.
3599 (Finternal_set_lisp_face_attribute): Use signal_error for the
3600 error of invalid fontset.
3602 * xterm.c (x_new_fontset): If FONTSETNAME specifies the default
3605 2002-09-19 Kenichi Handa <handa@m17n.org>
3607 * regex.c (re_search_2): Fix previous change.
3609 2002-09-18 Kenichi Handa <handa@m17n.org>
3611 * syntax.c (skip_syntaxes): Fix previous change.
3613 2002-09-13 Kenichi Handa <handa@m17n.org>
3615 * syntax.c (skip_chars): Fix previous change.
3616 (skip_syntaxes): Fix previous change.
3618 2002-09-06 Dave Love <fx@gnu.org>
3620 * config.in: Restore it.
3622 2002-09-05 Dave Love <fx@gnu.org>
3624 * config.in: Removed (now auto-generated).
3626 * s/usg5-4.h: Fix last change.
3628 * unexelf.c (unexec): Make .got handling not SGI-specific.
3630 * syntax.c (syms_of_syntax) <multibyte-syntax-as-symbol>: Doc fix.
3632 * regex.c: Use `ifdef HAVE_ALLOCA_H', not `if HAVE_ALLOCA_H'.
3634 * keyboard.c (read_key_sequence): Fix type error.
3636 * buffer.c (Fset_buffer_multibyte, Fset_buffer_multibyte): Fix
3639 * fontset.c (fontset_add): Return Lisp_Object.
3641 2002-09-03 Dave Love <fx@gnu.org>
3643 * charset.h (charset_ordered_list_tick): Declare extern.
3645 2002-09-03 Kenichi Handa <handa@m17n.org>
3647 The following changes (and some of 2002-08-20 changes of mine) are
3648 for handling syntax, category, and case conversion for unibyte
3649 characters by converting them to multibyte on the fly. With these
3650 changes, we don't have to setup syntax and case tables for unibyte
3651 characters in each language environment.
3653 * abbrev.c (Fexpand_abbrev): Convert a unibyte character to
3654 multibyte if necessary.
3656 * bytecode.c (Fbyte_code): Likewise.
3658 * character.h (LEADING_CODE_LATIN_1_MIN)
3659 (LEADING_CODE_LATIN_1_MAX): New macros.
3660 (unibyte_to_multibyte_table): Extern it.
3661 (unibyte_char_to_multibyte): New macro.
3662 (MAKE_CHAR_MULTIBYTE): Use unibyte_to_multibyte_table.
3663 (CHAR_LEADING_CODE): New macro.
3664 (FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE): New macro.
3666 * character.c (unibyte_to_multibyte_table): New variable.
3667 (unibyte_char_to_multibyte): Move to character.h and defined as
3669 (multibyte_char_to_unibyte): If C is an eight-bit character,
3670 convert it to the corresponding byte value.
3672 * charset.c (Fset_unibyte_charset): If the dimension of CHARSET is
3673 not 1, singals an error. Update the elements of
3674 unibyte_to_multibyte_table.
3675 (init_charset_once): Initialize unibyte_to_multibyte_table.
3676 (syms_of_charset): Define the charset `iso-8859-1'.
3678 * casefiddle.c (casify_object): Fix previous change.
3680 * cmds.c (internal_self_insert): In a multibyte buffer, insert C
3681 as is without converting it to unibyte. In a unibyte buffer,
3682 convert C to multibyte before checking the syntax.
3684 * lisp.h (unibyte_char_to_multibyte): Extern deleted.
3686 * minibuf.c (Fminibuffer_complete_word): Use the macro
3687 FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE.
3689 * regex.h (struct re_pattern_buffer): New member target_multibyte.
3691 * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
3692 (GET_CHAR_BEFORE_2): Check target_multibyte, not multibyte. If
3693 that is zero, convert an eight-bit char to multibyte.
3694 (MAKE_CHAR_MULTIBYTE, CHAR_LEADING_CODE): New dummy new macros for
3696 (PATFETCH): Convert an eight-bit char to multibyte.
3697 (HANDLE_UNIBYTE_RANGE): New macro.
3698 (regex_compile): Setup the compiled pattern for multibyte chars
3699 even if the given regex string is unibyte. Use PATFETCH_RAW
3700 instead of PATFETCH in many places. To handle `charset'
3701 specification of unibyte, call HANDLE_UNIBYTE_RANGE. Use bitmap
3702 only for ASCII chars.
3703 (analyse_first) <exactn>: Simplified because the compiled pattern
3705 <charset_not>: Setup fastmap from bitmap only for ASCII chars.
3706 <charset>: Use CHAR_LEADING_CODE to get leading codes.
3707 <categoryspec>: If multibyte, setup fastmap only for ASCII chars
3709 (re_compile_fastmap) [emacs]: Call analyse_first with the arg
3711 (re_search_2): In emacs, set the locale variable multibyte to 1,
3712 otherwise to 0. New local variable target_multibyte. Check it
3713 to decide the multibyteness of STR1 and STR2. If
3714 target_multibyte is zero, convert unibyte chars to multibyte
3715 before translating and checking fastmap.
3716 (TARGET_CHAR_AND_LENGTH): New macro.
3717 (re_match_2_internal): In emacs, set the locale variable multibyte
3718 to 1, otherwise to 0. New local variable target_multibyte. Check
3719 it to decide the multibyteness of STR1 and STR2. Use
3720 TARGET_CHAR_AND_LENGTH to fetch a character from D.
3721 <charset, charset_not>: If multibyte is nonzero, check fastmap
3722 only for ASCII chars. Call bcmp_translate with
3723 target_multibyte, not with multibyte.
3724 <begline>: Declare the local variable C as `unsigned'.
3725 (bcmp_translate): Change the last arg name to target_multibyte.
3727 * search.c (compile_pattern_1): Don't adjust the multibyteness of
3728 the regexp pattern and the matching target. Set cp->buf.multibyte
3729 to the multibyteness of the regexp pattern. Set
3730 cp->but.target_multibyte to the multibyteness of the matching
3732 (wordify): Use FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE instead of
3733 FETCH_STRING_CHAR_ADVANCE.
3734 (Freplace_match): Convert unibyte chars to multibyte.
3736 * syntax.c (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
3737 unibyte chars to multibyte.
3738 (back_comment): Likewise.
3739 (scan_words): Likewise.
3740 (skip_chars): The arg syntaxp is deleted, and the code for
3741 handling syntaxes is moved to skip_syntaxes. Callers changed.
3742 Fix the case that the multibyteness of STRING and the current
3743 buffer doesn't match.
3744 (skip_syntaxes): New function.
3745 (SYNTAX_WITH_MULTIBYTE_CHECK): Check C by ASCII_CHAR_P, not by
3747 (Fforward_comment): Use FETCH_CHAR_AS_MULTIBYTE to convert unibyte
3749 (scan_lists): Likewise.
3750 (Fbackward_prefix_chars): Likewise.
3751 (scan_sexps_forward): Likewise.
3753 2002-08-23 Kenichi Handa <handa@m17n.org>
3755 * xfaces.c (QCfontset): New variable.
3756 (LFACE_FONTSET): New macro.
3757 (check_lface_attrs): Check also LFACE_FONTSET_INDEX.
3758 (set_lface_from_font_name): Setup LFACE_FONTSET (lface).
3759 (Finternal_set_lisp_face_attribute): Handle QCfontset.
3760 (Finternal_get_lisp_face_attribute): Likewise.
3761 (lface_same_font_attributes_p): Fix checking of LFACE_FONT_INDEX,
3762 check also LFACE_FONTSET_INDEX.
3763 (face_fontset): Check attrs[LFACE_FONTSET_INDEX], not
3764 attrs[LFACE_FONT_INDEX].
3765 (syms_of_xfaces): Intern and staticpro QCfontset.
3767 * dispextern.h (enum lface_attribute_index): New member
3768 LFACE_FONTSET_INDEX.
3770 * fns.c (base64_encode_1): Handle eight-bit chars correctly.
3772 2002-08-21 Kenichi Handa <handa@m17n.org>
3774 * coding.c (coding_set_destination): Fix coding->destination for
3775 the case converting a region.
3776 (encode_coding_utf_8): Encode eight-bit chars as single byte.
3777 (encode_coding_object): Fix coding->dst_pos and
3778 coding->dst_pos_byte for the case converting a region.
3780 * insdel.c (insert_from_gap): Make it work even if PT != GTP.
3782 * character.h (BYTE8_STRING): New macro.
3784 * fns.c (base64_decode_1): Insert eight-bit chars correctly.
3786 2002-08-20 Kenichi Handa <handa@m17n.org>
3788 * xdisp.c (get_next_display_element): Don't display unibyte 8-bit
3789 characters by octal form.
3791 * abbrev.c (Fexpand_abbrev): Fix for the multibyte case.
3793 * buffer.h (_fetch_multibyte_char_len): Extern deleted.
3794 (FETCH_MULTIBYTE_CHAR): Don't use _fetch_multibyte_char_len.
3795 (BUF_FETCH_MULTIBYTE_CHAR): Likewise.
3796 (FETCH_CHAR_AS_MULTIBYTE): New macro.
3798 * casetab.c (set_canon, set_identity, shuffle): Simplified.
3800 * casefiddle.c (casify_object): Simplified. Handle the case that
3801 the case conversion change the byte length.
3802 (casify_region): Likewise
3804 * character.h (MAKE_CHAR_UNIBYTE, MAKE_CHAR_MULTIBYTE): New
3807 * character.c (_fetch_multibyte_char_len): This variable deleted.
3808 (syms_of_character): Setup Vprintable_chars.
3810 * editfns.c (Fchar_equal): Fix for the unibyte case.
3811 (Finsert_byte): New function.
3812 (syms_of_editfns): Defsubr it.
3814 * keyboard.c (read_key_sequence): Use ~CHAR_MODIFIER_MASK instead
3815 of direct code 0x3ffff.
3817 * search.c (Freplace_match): Fix for the unibyte case.
3819 2002-08-19 Kenichi Handa <handa@m17n.org>
3821 * lread.c (safe_to_load_p): Fix the logic.
3823 * syntax.c (scan_words): Don't treat characters belonging to
3824 different scripts as constituting a word.
3826 * editfns.c (Fformat): Use ASCII_CHAR_P, not SINGLE_BYTE_CHAR_P.
3828 * fontset.c (Fset_fontset_font): Treat `ascii' as charset, not
3831 * emacs.c (main): In the case of --unibyte, instead of aborting on
3832 finding non-empty buffer, make it unibyte.
3834 2002-08-18 Kenichi Handa <handa@m17n.org>
3836 * xterm.c (x_new_fontset): Call `create-fontset-from-ascii-font'
3837 to create a fontset.
3839 2002-08-18 Dave Love <fx@gnu.org>
3841 * character.c (Funibyte_char_to_multibyte): Doc fix.
3843 * xfns.c [HAVE_STDLIB_H]: Fix last change.
3845 2002-08-15 Kenichi Handa <handa@m17n.org>
3847 * fontset.c (fontset_add): Make the type `int'.
3848 (fontset_id_valid_p): Define it if FONTSET_DEBUG is defined.
3850 * character.c (unibyte_char_to_multibyte): Refer to
3851 charset_unibyte, not charset_primary.
3852 (multibyte_char_to_unibyte): Likewise.
3853 (Funibyte_char_to_multibyte): Likewise.
3855 * charset.h: (charset_unibyte): Extern it instead of
3858 * charset.c (charset_unibyte): Renamed from charset_primary.
3859 (Funibyte_charset): Renamed from Fprimary_charset.
3860 (Fset_unibyte_charset): Renamed from Fset_primary_charset.
3861 (syms_of_charset): Adjusted for the above changes.
3863 * w32term.c (x_produce_glyphs): Use ASCII_CHAR_P, not
3864 SINGLE_BYTE_CHAR_P. Fix the logic of handling non-ASCII char when
3865 it->multibyte_p is zero.
3867 * lisp.h (nonascii_insert_offset, Vnonascii_translation_table):
3870 2002-08-08 Kenichi Handa <handa@m17n.org>
3872 * coding.c (Fdefine_coding_system_internal): Fix category setting
3873 for a coding system of type iso-2022.
3875 2002-08-02 Kenichi Handa <handa@m17n.org>
3877 * fontset.h (FS_LOAD_FONT): Call fs_load_font with the arg CHARSET
3880 2002-08-01 Kenichi Handa <handa@m17n.org>
3882 * syntax.c (Vnext_word_boundary_function_table): New variable.
3883 (syms_of_syntax): Declare it as a Lisp variable.
3884 (scan_words): Call functions in Vnext_word_boundary_function_table
3887 * xterm.c (x_load_font): Initialize fontp->fontset to -1.
3889 * fontset.c (fs_load_font): If fontp->charset is not negative,
3890 return fontp without setting its members.
3892 2002-07-31 Dave Love <fx@gnu.org>
3894 * config.in: Generated with autoheader.
3896 * xfns.c [HAVE_STDLIB_H]: Change logic (instead of fixing typo).
3898 * m/sparc.h (HAVE_ALLOCA): Delete.
3900 * s/irix6-5.h: Don't include strings.h.
3901 (bcopy, bzero, bcmp): Don't undef.
3903 * s/irix6-0.h (bcopy, bzero, bcmp): Don't undef.
3905 * s/usg5-4.h (NO_SIOCTL_H): Don't define.
3906 (TIOCSIGSEND): Don't test IRIX6.
3907 (bcopy, bzero, bcmp): Define conditionally.
3909 2002-07-31 Kenichi Handa <handa@m17n.org>
3911 * buffer.c (Qas, Qmake, Qto): New variables.
3912 (Fset_buffer_multibyte): New optional arg METHOD. Caller changed.
3913 (syms_of_buffer): Intern and staticpro Qas, Qmake, and Qto.
3915 * callproc.c (Fcall_process): Don't call insert_1_both directly if
3916 we are inserting a process output into a multibyte buffer.
3918 * character.h (CHAR_TO_BYTE8): If C is not eight-bit char, call
3919 multibyte_char_to_unibyte.
3921 * character.c (Funibyte_char_to_multibyte): If C can't be decoded
3922 by the primary charset, make it eight-bit char.
3923 (Fmultibyte_char_to_unibyte): Call CHAR_TO_BYTE8.
3925 * charset.c: (charset_eight_bit, Qeight_bit_control): New
3927 (charset_8_bit__control, charset_8_bit_graphic,
3928 Qeight_bit_control, Qeight_bit_graphic): These variables deleted.
3929 (define_charset_internal): New function.
3930 (syms_of_charset): Call define_charset_internal for pre-defined
3933 * charset.h (charset_8_bit): Extern it.
3935 * coding.c (make_conversion_work_buffer): Adjusted for the change
3936 of Fset_buffer_multibyte.
3937 (encode_coding_raw_text): Increment p0 in the loop.
3939 * lisp.h (Fset_buffer_multibyte): Prototype adjusted.
3941 * xdisp.c (setup_echo_area_for_printing, set_message_1): Adjusted
3942 for the change of Fset_buffer_multibyte.
3944 * fns.c (Fstring_to_multibyte): New function.
3945 (syms_of_fns): Declare Fstring_to_multibyte as Lisp subroutine.
3947 2002-07-30 Dave Love <fx@gnu.org>
3949 * xfns.c (x_put_x_image): Declare args.
3951 * xfaces.c (font_name_registry, choose_face_font): Delete unused
3953 (try_font_list): Declare an arg.
3955 * xdisp.c (message2_nolog, set_message): Declare an arg.
3957 * terminfo.c (tparam): Declare an arg. Use P_ to declare tparm.
3959 * syntax.c (scan_sexps_forward): Declare an arg.
3961 * scroll.c (calculate_scrolling, calculate_direct_scrolling):
3964 * lisp.h (Fnew_fontset): Declare.
3966 * keymap.c (push_key_description): Call CHARACTERP correctly.
3968 * fontset.c (fontset_add): Declare args. Call make_number
3970 (face_for_char): Delete unused vars.
3971 (Fset_fontset_font): Doc fix. Delete unused vars.
3973 * doc.c (Fsubstitute_command_keys): Delete unused vars.
3975 * composite.c (update_compositions): Declare arg.
3977 * cm.c (calccost, cmgoto): Declare args.
3979 * charset.c: Remove `emacs' conditional. Doc fixes.
3980 (map_char_table_for_charset): Declare.
3982 * character.c (syms_of_character) <translation-table-vector>: Doc
3985 * ccl.c: Remove `emacs' conditional. Include hash table stuff
3988 2002-07-26 Kenichi Handa <handa@m17n.org>
3990 The following changes are to allow specifying multiple font
3991 patterns for a character range (specified by script or charset).
3993 * Makefile.in (abbrev.o): Depend on syntax.h.
3994 (xfaces.o): Depend on charset.h.
3996 * alloc.c (Fmake_string): Use ASCII_CHAR_P, not
3999 * ccl.c (Fccl_execute_on_string): Add `const' to local variables.
4001 * character.h (Vchar_script_table): Extern it.
4003 * character.c (Vscript_alist): This variable deleted.
4004 (Vchar_script_table, Qchar_script_table): New variable.
4005 (syms_of_character): Declare Vchar_script_table as a lisp variable
4008 * chartab.c (Fmake_char_table): Doc fixed. If PURPOSE doesn't
4009 have property char-table-extra-slots, make no extra slot.
4011 * dispextern.h (struct face): Member `charset' deleted.
4012 (FACE_SUITABLE_FOR_CHAR_P): Use ASCII_CHAR_P, not
4014 (FACE_FOR_CHAR): Likewise.
4015 (choose_face_font, lookup_non_ascii_face, font_name_registry): Add
4017 (lookup_face, lookup_named_face, lookup_derived_face): Prototype
4019 (generate_ascii_font_name): Renamed from generate_ascii_font.
4021 * fontset.h (get_font_repertory_func): New prototype.
4022 (make_fontset_for_ascii_face, fs_load_font): Prototypes fixed.
4023 (FS_LOAD_FONT): Call fs_load_font with the 3rd arg charset_ascii.
4025 * fontset.c (Qprepend, Qappend): New variables.
4026 (FONTSET_CHARSET_ALIST, FONTSET_FACE_ALIST): These macros deleted.
4027 (FONTSET_NOFONT_FACE, FONTSET_REPERTORY): New macros.
4028 (FONTSET_REF): Optimize if FONTSET is Vdefault_fontset.
4029 (FONTSET_REF_AND_RANGE, FONTSET_ADD): New macros.
4030 (fontset_ref_and_range, fontset_add, reorder_font_vector)
4031 (load_font_get_repertory): New functions.
4032 (fontset_set): This function deleted.
4033 (fontset_face): New arg FACE. Return face ID, not face.
4034 Completely re-written to handle new fontset structure. Caller
4036 (free_face_fontset): Use ASET istead of AREF (X) = Y.
4037 (face_for_char): Don't call lookup_face.
4038 (make_fontset_for_ascii_face): New arg FACE.
4039 (fs_load_font): New arg CHARSET_ID. Don't check
4040 Vfont_encoding_alist here.
4041 (find_font_encoding): New function.
4042 (list_fontsets): Use STRINGP, not ! NILP.
4043 (accumulate_script_ranges): New function.
4044 (Fset_fontset_font, Fnew_fontset, Ffontset_info): Completely
4045 re-written to handle new fontset structure.
4046 (Ffontset_font): Return a copy of element.
4047 (syms_of_fontset): Define symbols Qprepend and Qappend. Fix
4048 docstring of font-encoding-alist.
4050 * lisp.h (CHAR_TABLE_REF): Remove unnecessary check (IDX >= 0).
4051 (Fset_fotset_font): Fix arguments to 5.
4053 * msdos.c (XMenuActivate): Adjuted for the change of
4054 lookup_derived_face.
4056 * xdisp.c (message_dolog, set_message_1, extend_face_to_end_of_line):
4057 Use ASCII_CHAR_P, not SINGLE_BYTE_CHAR_P.
4058 (highlight_trailing_whitespace): Adjusted for the change of
4061 * xfaces.c: Include charset.h.
4062 (load_face_font): Argument C deleted. Caller changed.
4063 (generate_ascii_font_name): Renamed from generate_ascii_font.
4064 (font_name_registry): New function.
4065 (cache_face): Store ascii faces before non-ascii faces in buckets.
4066 (lookup_face): Arguments C and BASE_FACE deleted. Caller changed.
4067 Lookup only ascii faces.
4068 (lookup_non_ascii_face): New function.
4069 (lookup_named_face): Argument C deleted. Caller changed.
4070 (lookup_derived_face): Argument C deleted. Caller changed.
4071 (try_font_list): New arg PATTERN. Caller changed. If PATTERN is
4072 a string, just call font_list with it.
4073 (choose_face_font): Arguments FACE and C deleted. New arg
4074 FONT_SPEC. Caller changed.
4075 (realize_face): Arguments C and BASE_FACE deleted. Caller
4076 (realize_x_face): Likewise.
4077 (realize_non_ascii_face): New function.
4078 (realize_x_face): Call load_face_font here.
4079 (realize_tty_face): Argument C deleted. Caller changed.
4080 (compute_char_face): If CH is not ascii, call FACE_FOR_CHAR to
4082 (dump_realized_face): Don't print charset of FACE.
4084 * xfns.c (x_set_font): Always call x_new_fontset and
4085 store_frame_parameter.
4086 (Fx_create_frame): Call x_new_fontset, not x_new_font.
4087 (syms_of_xfns): Set get_font_repertory_func to
4088 x_get_font_repertory.
4090 * xterm.h (x_get_font_repertory): Extern it.
4092 * xterm.c (x_produce_glyphs): Use ASCII_CHAR_P, not
4093 SINGLE_BYTE_CHAR_P. Fix the logic of handling non-ASCII char when
4094 it->multibyte_p is zero.
4095 (XTread_socket): Use ASCII_CHAR_P, not SINGLE_BYTE_CHAR_P.
4096 (x_new_fontset): If FONTSETNAME doesn't match any existing
4097 fontsets, create a new one.
4098 (x_get_font_repertory): New function.
4100 2002-07-25 Kenichi Handa <handa@m17n.org>
4102 * coding.c (Ffind_coding_systems_region_internal): Detect an
4103 ASCII only string correctly.
4105 * lread.c (Fload): Don't load with Qload_force_doc_strings t if
4108 2002-07-24 Kenichi Handa <handa@m17n.org>
4110 * lread.c: Include "coding.h".
4111 (Qget_emacs_mule_file_char, Qload_force_doc_strings,
4112 load_each_byte, unread_char): New variables.
4113 (readchar_backlog): This variable deleted.
4114 (readchar): Return a character unless load_each_byte is nonzero.
4115 Handle the case that readcharfun is Qget_emacs_mule_file_char or a
4116 cons. If unread_char is not -1, simply return it.
4117 (unreadchar): Handle the case that readcharfun is
4118 Qget_emacs_mule_file_char or a cons. Set unread_char if
4120 (read_multibyte): This function deleted.
4121 (readbyte_for_lambda, readbyte_from_file, readbyte_from_string)
4122 (read_emacs_mule_char): New functions.
4123 (Fload): Even if the file doesn't have the extention ".elc", if
4124 safe_to_load_p returns a positive version number, assume that the
4125 file contains bytecompiled code. If the version is less than 22,
4126 load the file while decoding multibyte sequences by emacs-mule.
4127 (readevalloop): Don't use readchar_backlog.
4128 (Fread): Likewise. Pay attention to the case that STREAM is a
4130 (Fread_from_string): Pay attention to the case that STREAM is a
4132 (read_escape): The arg BYTEREP deleted.
4133 (read1): Set load_each_byte to 1 temporarily while handling
4134 #@NUMBER. Don't call read_multibyte.
4135 (read_vector): Call Fread with a cons. If readcharfun is
4136 Qget_emacs_mule_file_char, decode the read string by emacs-mule.
4137 (read_list): If doc_reference is 2, make the cdr part string as
4139 (syms_of_lread): Intern and staticpro Qget_emacs_mule_file_char
4140 and Qload_force_doc_strings.
4142 2002-07-23 Kenichi Handa <handa@m17n.org>
4144 * xdisp.c (face_before_or_after_it_pos): Call
4145 FETCH_MULTIBYTE_CHAR with byte postion, not char position.
4147 2002-07-22 Kenichi Handa <handa@m17n.org>
4149 * character.h (TRAILING_CODE_P): New macro.
4150 (MAYBE_UNIFY_CHAR): Adjusted for the change of Funify_charset.
4151 (string_char_with_unification): Fix prototype.
4152 (Vscript_alist): Extern it.
4154 * character.c (Vscript_alist): New variable.
4155 (string_char_with_unification): Add `const' to local variables.
4156 (str_as_unibyte): Likewise.
4157 (string_escape_byte8): Likewise.
4158 (syms_of_character): Declare script-alist as a Lisp variable.
4160 * charset.h (Vcharset_ordered_list): Extern it.
4161 (charset_ordered_list_tick): Extern it.
4162 (EMACS_MULE_LEADING_CODE_PRIVATE_11)
4163 (EMACS_MULE_LEADING_CODE_PRIVATE_12)
4164 (EMACS_MULE_LEADING_CODE_PRIVATE_21)
4165 (EMACS_MULE_LEADING_CODE_PRIVATE_22): New macros
4166 (Funify_charset): Adjusted for the change of Funify_charset.
4168 * charset.c (charset_ordered_list_tick): New variable.
4169 (Fdefine_charset_internal): Increment charset_ordered_list_tick.
4170 (Funify_charset): New optional arg DEUNIFY. If it is non-nil,
4171 deunify intead of unify a charset.
4172 (string_xstring_p): Add `const' to local variables.
4173 (find_charsets_in_text): Add `const' to arguemnts and local
4175 (encode_char): Adjusted for the change of Funify_charset. Fix
4176 detecting of invalid code.
4177 (Fset_charset_priority): Increment charset_ordered_list_tick.
4178 (Fmap_charset_chars): Fix handling of default value for FROM_CODE
4181 * coding.c (LEADING_CODE_PRIVATE_11, LEADING_CODE_PRIVATE_12)
4182 (LEADING_CODE_PRIVATE_21, LEADING_CODE_PRIVATE_22): Macros
4183 deleted. Callers changed to use
4184 EMACS_MULE_LEADING_CODE_PRIVATE_11, etc.
4185 (decode_coding_ccl): Add `const' to local variables.
4186 (consume_chars): Likewise.
4187 (Ffind_coding_systems_region_internal): Likewise.
4188 (Fcheck_coding_systems_region): Likewise.
4190 * print.c (print_object): Use octal form for printing the
4191 contents of a bool vector.
4193 2002-07-18 Dave Love <fx@gnu.org>
4195 * lread.c (Fload) <!load_dangerous_libraries>: Don't leak fd.
4196 <version == 20>: Refuse to load.
4198 2002-07-17 Dave Love <fx@gnu.org>
4200 * fns.c: Move coding.h.
4201 (Qcodeset, Qdays, Qmonths): New.
4202 (concat): Use CHARACTERP instead of INTERGERP.
4203 (Flocale_codeset): Deleted.
4204 (Flanginfo): New function.
4205 (syms_of_fns): Changed accordingly.
4207 * coding.c (adjust_coding_eol_type): Fix eol_type/eol_seen mixup.
4209 2002-07-16 Dave Love <fx@gnu.org>
4211 * casetab.c (init_casetab_once, init_casetab_once): Fix
4212 CHAR_TABLE_SET call.
4214 * category.c (Fmodify_category_entry): Fix CATEGORY_MEMBER call.
4216 * character.c (syms_of_character): Fix CHAR_TABLE_SET call.
4218 * charset.c (Fmap_charset_chars): Check args. Convert Lisp types.
4219 (load_charset_map, Fdeclare_equiv_charset, Fencode_char)
4220 (Fset_charset_priority, syms_of_charset): Convert Lisp types.
4222 * charset.h (CHECK_CHARSET_GET_ID): Use XINT on AREF result.
4224 * coding.c (ENCODE_DESIGNATION, decode_eol)
4225 (make_conversion_work_buffer, code_conversion_restore)
4226 (Fdefine_coding_system_internal): Convert Lisp types.
4227 (code_conversion_restore): Use EQ, not ==.
4228 (Fencode_coding_string): Fix code_convert_string call.
4230 * coding.h (code_convert_region): Fix prototype.
4232 * dispextern.h (redraw_frame, redraw_garbaged_frames): Removed.
4234 * fontset.c (fontset_ref, fontset_set, fs_load_font)
4235 (Ffontset_info): Convert Lisp types.
4237 * syntax.h (SYNTAX_ENTRY_INT): Don't use make_number.
4239 * xterm.c (note_mouse_movement): Fix call of window_from_coordinates.
4241 * xdisp.c (display_mode_element): Fix call of Fset_text_properties.
4243 * chartab.c: Include "...h", not <...h> in some cases.
4245 * callproc.c (Fcall_process): Remove unused variables.
4247 2002-07-12 Dave Love <fx@gnu.org>
4249 * coding.c (Fset_coding_system_priority): Allow null arg list.
4251 2002-07-03 Dave Love <fx@gnu.org>
4253 * minibuf.c (Fminibuffer_complete_word): Remove unused var.
4254 (Fself_insert_and_exit): Use CHARACTERP.
4256 * callproc.c (Fcall_process): Remove unused vars.
4258 * xterm.c (XTread_socket): Add extra dead keysyms.
4260 * xdisp.c (decode_mode_spec_coding): Use CHARACTERP.
4262 * dispextern.h: Remove prototypes for redraw_frame,
4263 redraw_garbaged_frames.
4265 * cmds.c (Fself_insert_command): Use CHARACTERP.
4267 * chartab.c (make_sub_char_table): Remove unused var.
4268 (Fset_char_table_default, Fmap_char_table): Doc fix.
4270 * keymap.c (access_keymap): Remove generic char code.
4271 (push_key_description): Use CHARACTERP.
4273 2002-07-01 Dave Love <fx@gnu.org>
4275 * charset.c: Doc fixes.
4276 (Funify_charset): Extra checking.
4278 2002-06-24 Dave Love <fx@gnu.org>
4280 * lread.c: Remove some unused variables.
4281 (safe_to_load_p): If safe, return the magic number version byte.
4282 (Fload): Maybe use load-with-code-conversion.
4284 2002-06-12 Kenichi Handa <handa@m17n.org>
4286 * category.c (Fmodify_category_entry): Don't modify the contents
4287 of category_set for characters out of the range. Avoid
4288 unnecessary modification.
4290 * character.h (MAYBE_UNIFY_CHAR): Adjusted for the change of
4291 Vchar_unify_table. The default value of the table is now nil.
4293 * character.c (syms_of_character): Setup Vchar_width_table for
4294 eight-bit-control and raw-byte chars.
4296 * charset.h (enum define_charset_arg_index): Delete
4297 charset_arg_parents and add charset_arg_subset and
4298 charset_arg_superset.
4299 (enum charset_attr_index): Delete charset_parents and add
4300 charset_subset and charset_superset.
4301 (enum charset_method): Delete CHARSET_METHOD_INHERIT and add
4302 CHARSET_METHOD_SUBSET and CHARSET_METHOD_SUPERSET.
4303 (CHARSET_ATTR_PARENTS, CHARSET_PARENTS): Macros deleted.
4304 (CHARSET_ATTR_SUBSET, CHARSET_ATTR_SUPERSET, CHARSET_SUBSET)
4305 (CHARSET_SUPERSET): New macros.
4306 (charset_work): Extern it.
4307 (ENCODE_CHAR): Use charset_work.
4308 (CHAR_CHARSET_P): Adjusted for the change of encoder format.
4309 (map_charset_chars): Extern it.
4311 * charset.c (load_charset_map): Set the default value of encoder
4312 and deunifier char-tables to nil.
4313 (map_charset_chars): Argument changed. Callers changed. Use
4314 map_char_table_for_charset instead of map_char_table.
4315 (Fmap_charset_chars): New optional args from_code and to_code.
4316 (Fdefine_charset_internal): Adjusted for the change of
4317 `define-charset' (:parents -> :subset or :superset).
4318 (charset_work): New variable.
4319 (encode_char): Adjusted for the change of
4320 Fdefine_charset_internal.
4321 (syms_of_charset): Likewise.
4322 (Ffind_charset_string): Setup the vector `charsets' correctly.
4324 * chartab.c (sub_char_table_ref_and_range): New arg defalt. Fix
4325 the previous change.
4326 (char_table_ref_and_range): Adjusted for the above change.
4327 (map_sub_char_table_for_charset): New function.
4328 (map_char_table_for_charset): New function.
4330 * keymap.c (describe_vector): Handle a char-table directly here.
4331 (describe_char_table): Deleted.
4333 * lisp.h (map_charset_chars): Deleted.
4335 2002-06-11 Dave Love <fx@gnu.org>
4337 * fns.c (count_combining): Comment out (unused).
4338 (Flocale_codeset): New.
4339 (syms_of_fns): Defsubr it.
4341 * config.in (HAVE_PTY_H, HAVE_SIZE_T, HAVE_LANGINFO_CODESET): New.
4344 2002-06-06 Dave Love <fx@gnu.org>
4346 * Makefile.in (chartab.o): Depend on charset.h
4348 2002-06-03 Kenichi Handa <handa@m17n.org>
4350 * character.c (syms_of_character): Set the default value of
4351 Vprintable_chars to Qnil.
4353 2002-05-31 Dave Love <fx@gnu.org>
4355 * Makefile.in (lisp, shortlisp): Change indian.elc to indian.el.
4357 2002-05-31 Kenichi Handa <handa@m17n.org>
4359 * charset.c (load_charset_map): Handle the case that from < to
4362 * coding.c (encode_coding_emacs_mule): Pay attention to raw-8-bit
4364 (encode_coding_iso_2022): Likewise.
4365 (encode_coding_sjis): Likewise.
4366 (encode_coding_big5): Likewise.
4367 (encode_coding_charset): Likewise.
4369 2002-05-30 Kenichi Handa <handa@m17n.org>
4371 * Makefile.in (lisp): Change chinese.elc to chinese.el. They are
4372 not bytecompiled now.
4373 (shortlisp): Likewise.
4375 * charset.c (charset_jisx0201_roman, charset_jisx0208_1978)
4376 (charset_jisx0208): New variables.
4377 (Fdefine_charset_internal): Setup them if appropriate.
4378 (init_charset_once): Initialize them to -1.
4380 * charset.h (charset_jisx0201_roman, charset_jisx0208_1978,
4381 charset_jisx0208): Extern them.
4383 * coding.c (CODING_ISO_FLAG_USE_ROMAN): New macro
4384 (CODING_ISO_FLAG_USE_OLDJIS): New macro.
4385 (CODING_ISO_FLAG_FULL_SUPPORT): Macro definition changed.
4386 (setup_iso_safe_charsets): Fix arguemtns to Fassq.
4387 (DECODE_DESIGNATION): Pay attention to CODING_ISO_FLAG_USE_ROMAN
4388 and CODING_ISO_FLAG_USE_OLDJIS.
4389 (ENCODE_ISO_CHARACTER_DIMENSION1): Likewise.
4390 (ENCODE_ISO_CHARACTER_DIMENSION2): Likewise.
4391 (encode_coding_iso_2022): Change the 1st arg to
4392 ENCODE_ISO_CHARACTER to a variable.
4394 2002-05-29 Kenichi Handa <handa@m17n.org>
4396 * charset.h (enum define_charset_arg_index): New enums
4397 charset_arg_min_code and charset_arg_max_code.
4398 (struct charset): New member char_index_offset.
4400 * charset.c (CODE_POINT_TO_INDEX): Take charset->char_index_offset
4402 (INDEX_TO_CODE_POINT): Likewise.
4403 (Fdefine_charset_internal): Handle args[charset_arg_min_code] and
4404 args[charset_arg_max_code]. Setup charset.char_index_offset.
4405 (syms_of_charset): Fix args to Fdefine_charset_internal.
4407 2002-05-27 Dave Love <fx@gnu.org>
4409 * coding.c (decode_coding_utf_8): Reject overlong sequences.
4411 2002-05-26 Dave Love <fx@gnu.org>
4413 * coding.c: Doc fixes.
4414 (Fcoding_system_aliases): Fix return value.
4415 (Qmac): Remove (duplicated) definition.
4417 2002-05-25 Dave Love <fx@gnu.org>
4419 * charset.c (Fcharset_priority_list, Fset_charset_priority): New
4422 * character.c (Fstring): Doc fix.
4424 * charset.c (Fdefine_charset_alias): Update Vcharset_list.
4426 * fontset.c (Ffontset_info): Doc fix. Return charset names, not
4428 (font-encoding-alist): Doc fix.
4430 2002-05-24 Dave Love <fx@gnu.org>
4432 * term.c (costs_set): Declare static, non-initialized for pcc.
4433 (encode_terminal_code): Remove ensued var.
4435 * keyboard.c (kbd_buffer_store_event): Fix interrupt_signal decl
4438 * xterm.c (xlwmenu_window_p): Fix prototype for K&R.
4440 * coding.c (setup_iso_safe_charsets): Fix arg decl for K&R.
4441 (suffixes): Moved out of make_subsidiaries for K&R.
4443 * charset.c (map_charset_chars): Fix c_function declaration for
4446 * lisp.h (DEFUN) [!PROTOTYPES]: Remove spurious `args'.
4448 2002-05-23 Dave Love <fx@gnu.org>
4450 * data.c (Fchar_or_string_p): Doc fix. Use CHARACTERP.
4452 * category.c (Fmodify_category_entry): Doc fix. Remove unused
4455 2002-05-23 Yong Lu <lyongu@asia-infonet.com>
4457 * charset.c (Fdefine_charset_internal): Fix argument to bzero.
4459 * coding.c (Fdefine_coding_system_internal): Fix previous change.
4460 (decode_coding_charset): Workaround for the bug of GCC 2.96.
4462 2002-05-23 Kenichi Handa <handa@m17n.org>
4464 * Makefile.in (lisp): Change cyrillic.elc to cyrillic.el,
4465 vietnamese.elc to vietnamese.el. They are not bytecompiled now.
4466 (shortlisp): Likewise.
4468 2002-05-22 Kenichi Handa <handa@m17n.org>
4470 * coding.c (decode_coding_charset): Adjusted for the change of
4471 Fdefine_coding_system_internal.
4472 (Fdefine_coding_system_internal): For a coding system of
4473 `charset' type, store a list of charset IDs in
4474 `charset_attr_charset_valids' element of coding attributes.
4476 * charset.c (Fmake_char): Fix previous change.
4478 2002-05-21 Kenichi Handa <handa@m17n.org>
4480 * coding.c (ONE_MORE_BYTE_NO_CHECK): Increment consumed_chars.
4481 (emacs_mule_char): New arg src. Delete arg `composition'. Caller
4482 changed. Handle 2-byte and 3-byte charsets correctly.
4483 (DECODE_EMACS_MULE_COMPOSITION_RULE_20): Renamed from
4484 DECODE_EMACS_MULE_COMPOSITION_RULE. Caller changed.
4485 (DECODE_EMACS_MULE_COMPOSITION_RULE_21): New macro.
4486 (DECODE_EMACS_MULE_21_COMPOSITION): Call
4487 DECODE_EMACS_MULE_COMPOSITION_RULE_21. Produce correct annotation
4489 (decode_coding_emacs_mule): Handle composition correctly. Rewind
4490 `src' and `consumed_chars' correctly before calling
4492 (DECODE_COMPOSITION_START): Correctly handle the case of altchar
4493 and alt&rule composition.
4494 (decode_coding_iso_2022): Handle composition correctly.
4495 (init_coding_once): Setup emacs_mule_bytes for private charsets.
4497 * charset.c (Fdefine_charset_internal): Fix bug for the case of
4498 re-defining a charset. If the charset has :emacs-mule-id, setup
4500 (Fmake_char): If CODE1 is nil, use the minimum code of the
4503 2002-05-20 Kenichi Handa <handa@m17n.org>
4505 * coding.c (encode_coding_iso_2022): If coding requires safe
4506 encoding, produce a character specified by
4507 CODING_INHIBIT_CHARACTER_SUBSTITUTION.
4508 (encode_coding_sjis): Likewise.
4509 (encode_coding_big5): Likewise.
4510 (encode_coding_charset): Likewise.
4512 2002-05-17 Dave Love <fx@gnu.org>
4514 * xterm.c (XSetIMValues): Declare.
4516 * process.c: Conditionally include sys/wait.h, pty.h.
4518 * print.c (print_object): Fix print format for 64-bit
4521 * keyboard.c (modify_event_symbol): Fix print format for 64-bit
4524 * buffer.c (emacs_strerror): Declare.
4525 (MMAP_ALLOCATED_P, mmap_enlarge, syms_of_buffer): Import changes
4528 * fontset.c (Fclear_face_cache): Declare.
4529 (accumulate_font_info): Commented-out (unused).
4530 (face_for_char, Fset_fontset_font, Ffontset_info): Remove unused
4533 * character.h (string_escape_byte8): Declare.
4535 * charset.c (load_charset_map, load_charset_map_from_file): Remove
4537 (Fdefine_charset_internal, Fsplit_char, syms_of_charset)
4538 (Fmap_charset_chars): Doc fix.
4540 * coding.c (Vchar_coding_system_table, Qchar_coding_system):
4542 (Fset_coding_system_priority, Fset_coding_system_priority)
4543 (Fdefine_coding_system_internal): Doc fix.
4545 2002-05-16 Dave Love <fx@gnu.org>
4547 * s/osf5-0.h (C_SWITCH_SYSTEM) [!__GNUC__]: Remove -nointrinsics.
4549 2002-05-16 Kenichi Handa <handa@m17n.org>
4551 * character.c (string_escape_byte8): Make multibyte string with
4554 * charset.c (Fmake_char): Delete unnecessary code.
4556 2002-05-14 Kenichi Handa <handa@m17n.org>
4558 * xfns.c (x_encode_text): Allocate coding.destination here, and
4559 call encode_coding_object with dst_object Qnil.
4561 * buffer.c (Fset_buffer_multibyte): Convert 8-bit bytes to
4562 multibyte form correctly.
4564 * fontset.c (fs_load_font): Check fontp->full_name (not fontname)
4565 against Vfont_encoding_alist.
4567 * coding.c (Fdecode_sjis_char): Fix typo (0x7F->0xFF). Fix the
4568 handling of charset list.
4569 (encode_coding_iso_2022): Setup coding->safe_charsets in advance.
4570 (decode_coding_object): Move point to coding->dst_pos before
4571 calling post-read-conversion function.
4572 (encode_coding_object): Give correct arguments to
4573 pre-write-conversion. Ignore the return value of
4574 pre-write-conversion function. Pay attention to the case that
4575 pre-write-conversion changes the current buffer. If dst_object is
4576 Qt, even if coding->src_bytes is zero, allocate at least one byte
4577 to coding->destination.
4579 * coding.h (JIS_TO_SJIS): Fix typo (j1->s1, j2->s2).
4581 * charset.c (Fmake_char): Make it more backward compatible.
4582 (Fmap_charset_chars): Fix docstring.
4584 2002-05-13 Dave Love <fx@gnu.org>
4586 * coding.c: Doc fixes.
4587 (Fdefine_coding_system_alias): Use names, not symbols, in
4588 coding-system-alist.
4590 2002-05-13 Kenichi Handa <handa@m17n.org>
4592 * fontset.c (free_realized_fontsets): Call Fclear_face_cache instead
4593 of calling free_realized_face.
4595 2002-05-10 Yong Lu <lyongu@asia-infonet.com>
4597 * charset.c (load_charset_map): Fix previous change.
4598 (read_hex): Don't treat SPC as a comment starter.
4599 (decode_char): If CODE_POINT_TO_INDEX retruns -1, always return
4601 (Fdecode_char): Fix typo.
4603 2002-05-10 Kenichi Handa <handa@m17n.org>
4605 * charset.h (struct charset): New member `code_space_mask'.
4607 * coding.c (coding_set_source): Delete the local variable
4609 (encode_coding_charset): Delete the local variable charset.
4610 (Fdefine_coding_system_internal): Likewise.
4611 (Fdefine_coding_system_internal): Setup
4612 attrs[coding_attr_charset_valids] correctly.
4614 * charset.c (CODE_POINT_TO_INDEX): Utilize `code_space_mask'
4615 member to check if CODE is valid or not.
4616 (Fdefine_charset_internal): Initialize `code_space_mask' member.
4617 (encode_char): Before calling CODE_POINT_TO_INDEX, check if CODE
4618 is within the range of charset->min_code and carset->max_code.
4620 2002-05-09 Dave Love <fx@gnu.org>
4622 * syntax.h (syntax_temp) [!__GNUC__]: Declare.
4624 * dispextern.h (generate_ascii_font): Fix return type.
4626 * xfaces.c (generate_ascii_font): Fix arg declaration.
4628 * coding.c (coding_inherit_eol_type)
4629 (Fset_terminal_coding_system_internal)
4630 (Fset_safe_terminal_coding_system_internal): Fix arg declarations.
4632 2002-05-08 Kenichi Handa <handa@m17n.org>
4634 * coding.c (decode_coding_charset, encode_coding_charset): Handle
4635 multiple charsets correctly.
4637 2002-05-07 Kenichi Handa <handa@m17n.org>
4639 * search.c (boyer_moore): Fix handling of mulitbyte character
4642 * xdisp.c (display_mode_element): When the variable `elt' is
4643 changed, update `this' and `lisp_string'.
4645 2002-05-07 Kenichi Handa <handa@m17n.org>
4647 * buffer.c (Fset_buffer_multibyte): Fix 8-bit char handling.
4649 * callproc.c (Fcall_process): Be sure to give the current buffer
4650 to decode_coding_c_string. Update PT and PT_BYTE after the
4653 * charset.c (struct charset_map_entries): New struct.
4654 (load_charset_map): Renamed from parse_charset_map. New args
4655 entries and n_entries. Caller changed.
4656 (load_charset_map_from_file): Renamed from load_charset_map.
4657 Caller changed. New arg control_flag. Call load_charset_map at
4659 (load_charset_map_from_vector): New function.
4660 (Fdefine_charset_internal): Setup charset.compact_codes_p.
4661 (encode_char): If the charset is compact, change a character index
4664 * coding.c (coding_alloc_by_making_gap): Check the case that the
4665 source and destination are the same correctly.
4666 (decode_coding_raw_text): Set coding->consumed_char and
4667 coding->consumed to 0.
4668 (produce_chars): If coding->chars_at_source is nonzero, update
4669 coding->consumed_char and coding->consumed before calling
4671 (Fdefine_coding_system_alias): Register ALIAS in
4672 Vcoding_system_alist.
4673 (syms_of_coding): Define `no-convesion' coding system at the tail.
4675 * fileio.c (Finsert_file_contents): Set coding_system instead of
4676 val. If the current buffer is multibyte, always call
4679 * xfaces.c (try_font_list): Give higher priority to fontset's
4680 family than face's family.
4682 2002-04-18 Kenichi Handa <handa@m17n.org>
4684 * callproc.c (Fcall_process): Be sure to give the current buffer
4685 to decode_coding_c_string.
4687 * xfaces.c (try_font_list): Give a family specified in a fontset
4688 higher priority than a family specified in a face.
4690 2002-04-09 Kenichi Handa <handa@m17n.org>
4692 * fileio.c (Finsert_file_contents): Fix calculation of `inserted'.
4693 Fix arguments to insert_from_buffer.
4695 * xdisp.c (display_mode_element): Fix calculation of `bytepos'.
4697 2002-03-11 Kenichi Handa <handa@m17n.org>
4699 * coding.c (produce_chars): Set the variable `multibytep' correctly.
4700 (decode_coding_gap): Set coding->dst_multibyte correctly.
4702 2002-03-07 Kenichi Handa <handa@m17n.org>
4704 * coding.c (encode_coding_utf_8): Initialize produced_chars to 0.
4705 (decode_coding_utf_16): Fix converting high and low bytes to
4707 (encode_coding_utf_16): Substitute coding->default_char for
4708 non-Unicode characters.
4709 (decode_coding): Don't call record_insert here.
4710 (setup_coding_system): Initialize `surrogate' of
4711 coding->spec.utf_16 to 0.
4712 (EMIT_ONE_BYTE): Fix for multibyte case.
4714 * insdel.c (insert_from_gap): Call record_insert.
4716 2002-03-04 Kenichi Handa <handa@m17n.org>
4718 * casefiddle.c (casify_region): Fix multibyte case.
4720 * character.c (c_string_width): Add return type `int'.
4721 (char_string_with_unification): Arg ADVANCED deleted.
4723 * character.h (CHAR_VALID_P): Don't call CHARACTERP.
4724 (CHAR_STRING): Adjusted for the change of
4725 char_string_with_unification.
4726 (CHAR_STRING_ADVANCE): Make it do-while statement.
4728 * chartab.c (sub_char_table_set_range): Optimized for the case
4729 DEPTH == 3. Add workaround code for a GCC optimization bug.
4731 * charset.c (parse_charset_map): Remove an unused variable.
4733 * coding.c: Delete unused variables.
4735 * fileio.c (Finsert_file_contents): Set coding_system to Qnil
4736 earlier. If inserted is zero and the coding system doesn't
4737 require flushing, don't call decode_coding_gap.
4739 * syntax.h (SET_RAW_SYNTAX_ENTRY): Don't call make_number.
4741 2002-03-01 Kenichi Handa <handa@m17n.org>
4743 The following changes are for using Unicode as an internal
4744 character model, and use UTF-8 format for buffer/string
4747 * .gdbinit (xchartable): Adjusted for the change of char table
4749 (xsubchartable, xcoding, xcharset, xcurbuf): New commands.
4751 * Makefile.in (obj): Add character.o and chartab.o.
4752 (lisp, shortlisp): Remove utf-8.elc:
4753 (*.o): For many files, change dependency on charset.h to
4754 character.h, and add dependency on character.h.
4755 (character.o, chartab.o): New targets.
4757 * abbrev.c, bytecode.c, casefiddle.c, cmds.c, dispnew.c, doc.c,
4758 doprnt.c, dosfns.c, frame.c, marker.c, minibuf.c, msdos.c,
4759 w16select.c, w32bdf.c, w32console.c: Include "character.h" instead
4762 * dired.c, filelock.c: Include "character.h".
4764 * alloc.c: Include "character.h" instead of "charset.h".
4765 (Fmake_char_table): Moved to chartab.c.
4766 (make_sub_char_table): Likewise.
4767 (syms_of_alloc): Remove defsubr for Smake_char_table.
4769 * buffer.c: Include "character.h" instead of "charset.h", don't
4771 (Fset_buffer_multibyte): Adjuted for UTF-8.
4773 * buffer.h: EXFUN Fbuffer_live_p.
4775 * callproc.c: Include "character.h" instead of "charset.h".
4776 (Fcall_process): Big change for the new code-conversion APIs.
4778 * casetab.c: Include "character.h" instead of "charset.h".
4779 (set_canon, set_identity, shuffle): Adjusted for the new
4780 map_char_table spec.
4781 (init_casetab_once): Call CHAR_TABLE_SET instead of directly
4782 accessing the char table structure.
4784 * chartab.c: New file that implements char table.
4786 * category.c: Include "character.h".
4787 (copy_category_entry): New function.
4788 (copy_category_table): Call map_char_table and copy_category_entry.
4789 (Fmake_category_table): Initialize all top-vel slots.
4790 (char_category_set): New function.
4791 (modify_lower_category_set): Deleted.
4792 (Fmodify_category_entry): Call char_table_ref_and_range.
4794 * category.h (CATEGORY_SET): Just call char_category_set.
4796 * ccl.c: Include "character.h".
4797 (Qccl, Qcclp): New variables.
4798 (CCL_WRITE_CHAR): Alway treat the arg CH as a character even if
4800 (CCL_WRITE_MULTIBYTE_CHAR): Deleted.
4801 (CCL_WRITE_STRING, CCL_READ_CHAR): Adjusted for the change of SRC
4803 (ccl_driver): Types of arguments changed. Code adjusted for that.
4804 (Fccl_execute, Fccl_execute_on_string): Adjusted for the change of
4806 (syms_of_ccl): Intern and staticpro Qccl and Qcclp.
4808 * ccl.h (struct ccl_program): Members eol_type and multibyte
4809 deleted. New members src_multibyte, dst_multibyte, consumed, and
4811 (struct ccl_spec): Members decoder and encoder deleted. New
4813 (CODING_SPEC_CCL_PROGRAM): New macro.
4814 (ccl_driver): Prototype updated.
4815 (Qccl, Qcclp, Fccl_program_p): Extern them.
4816 (CHECK_CCL_PROGRAM): New macro.
4818 * character.c, character.h, chartab.c: New files.
4820 * charset.c: Mostly re-written. Character and multibyte sequence
4821 handling codes are moved to character.c.
4823 * charset.h: Mostly re-written. Character and multibyte sequence
4824 handling codes are moved to character.h.
4826 * coding.c, coding.h: Mostly re-written.
4828 * composite.c: Include "character.h" instead of "charset.h".
4829 (CHAR_WIDTH): Moved to character.h.
4830 (HASH_KEY, HASH_VALUE): Deleted.
4832 * composite.h (enum composition_method): Order of enumeration
4835 * data.c: Include "character.h" instead of "charset.h".
4836 (Faref): Call CHAR_TABLE_REF for a char table.
4837 (Faset): Call CHAR_TABLE_SET for a char table.
4839 * dispextern.h (free_realized_face, check_face_attribytes,
4840 generate_ascii_font): Extern them.
4841 (free_realized_multibyte_face): Extern deleted.
4843 * disptab.h (DISP_CHAR_VECTOR): Adjusted for the change of char
4846 * editfns.c: Include "character.h" instead of "charset.h".
4847 (Fchar_to_string): Always call CHAR_STRING.
4849 * emacs.c (main): Call init_charset_once, init_charset,
4850 syms_of_chartab, and syms_of_character.
4852 * fileio.c: Include "character.h" instead of "charset.h".
4853 (Finsert_file_contents): Big change for the new code-conversion
4855 (choose_write_coding_system): Likewise.
4856 (Fwrite_region): Likewise.
4857 (build_annotations_2): Deleted.
4858 (e_write): Big change for the new code-conversion API.
4860 * fns.c: Include "character.h" instead of "charset.h".
4861 (copy_sub_char_table): Moved to chartab.c.
4862 (Fcopy_sequence): Call copy_char_table for a char table.
4863 (concat): Delete codes calling count_multibyte.
4864 (string_char_to_byte): Adjusted for the new multibyte form.
4865 (string_byte_to_char): Likewise.
4866 (internal_equal): Adjusted for the change of char table structure.
4867 (Fchar_table_subtype, Fchar_table_parent, Fset_char_table_parent,
4868 Fchar_table_extra_slot, Fset_char_table_extra_slot,
4869 Fchar_table_range, Fset_char_table_range, Fset_char_table_default,
4870 char_table_translate, optimize_sub_char_table,
4871 Foptimize_char_table, map_char_table, Fmap_char_table): Moved to
4873 (char_table_ref_and_index): Deleted.
4874 (HASH_KEY, HASH_VALUE): Moved to lisp.h.
4875 (Fmd5): Call preferred_coding_system instead of accessing
4876 Vcoding_category_list. Adjusted for the new code-conversion API.
4877 (syms_of_fns): Defsubr for char table related functions moved to
4880 * fontset.c: Mostly re-written.
4882 * fontset.h (struct font_info): Type of the member encoding_type
4884 (enum FONT_SPEC_INDEX): New enum.
4885 (fontset_font_pattern, fs_load_font): Prototype updated.
4886 (FS_LOAD_FONT): Adjusted for the change of fs_load_font.
4888 * indent.c: Include "character.h" instead of "charset.h".
4889 (MULTIBYTE_BYTES_WIDTH): Call CHAR_WIDTH instead of
4892 * insdel.c: Include "character.h" instead of "charset.h".
4893 (copy_text): Don't refer to Vnonascii_translation_table.
4894 (insert_from_gap): New function.
4896 * keyboard.c: Include "character.h" instead of "charset.h".
4897 (command_loop_1): Never call direct_output_forward_char before
4898 a non-ASCII character.
4899 (read_char): If Vkeyboard_translate_table is a char table, always
4900 translated a character.
4902 * keymap.c: Include "character.h".
4903 (store_in_keymap): Handle the case that IDX is a cons.
4904 (Fdefine_key): Handle the case that KEY is a cons and the car part
4905 is also a cons (range).
4906 (push_key_description): Adjusted for the new character code.
4907 (describe_vector): Call describe_char_table for a char table.
4908 (describe_char_table): New function.
4910 * keymap.h (describe_char_table): Extern it.
4912 * lisp.h (enum pvec_type): New member PVEC_SUB_CHAR_TABLE.
4913 (XSUB_CHAR_TABLE, XSETSUB_CHAR_TABLE): New macros.
4914 (CHAR_TABLE_ORDINARY_SLOTS, CHAR_TABLE_SINGLE_BYTE_SLOTS,
4915 SUB_CHAR_TABLE_ORDINARY_SLOTS, SUB_CHAR_TABLE_STANDARD_SLOTS):
4917 (CHAR_TABLE_REF, CHAR_TABLE_SET): Adjusted for the new char table
4919 (CHAR_TABLE_TRANSLATE): Just call char_table_translate.
4920 (CHARTAB_SIZE_BITS_0, CHARTAB_SIZE_BITS_1, CHARTAB_SIZE_BITS_2,
4921 CHARTAB_SIZE_BITS_3): New macros.
4922 (chartab_size): Extern it.
4923 (struct Lisp_Char_Table): Re-designed.
4924 (struct Lisp_Sub_Char_Table): New structure.
4925 (HASH_KEY, HASH_VALUE): Moved from fns.c.
4926 (CHARACTERBITS): Defined as 22.
4927 (GLYPH_MASK_FACE, GLYPH_MASK_CHAR): Adjusted for the above change.
4928 (SUB_CHAR_TABLE_P): Check PVEC_CHAR_TABLE.
4929 (GC_SUB_CHAR_TABLE_P): New macro.
4930 (Fencode_coding_string, Fdecode_coding_string): EXFUN Updated.
4931 (code_convert_string_norecord): Extern deleted.
4932 (init_character_once, syms_of_character, init_charset,
4933 syms_of_composite, Qeq, Fmakehash, insert_from_gap): Extern them.
4935 * lread.c: Include "character.h".
4936 (read_multibyte): New arg NBYTES.
4937 (read_escape): The meaning of returned *BYTEREP changed.
4938 (to_multibyte): Deleted.
4939 (read1): Adjuted the handling of char table and string.
4941 * print.c: Include "character.h" instead of "charset.h".
4942 (print_string): Convert 8-bit raw bytes to octal form by
4943 string_escape_byte8.
4944 (print_object): Adjusted for the new multibyte form. Print 8-bit
4945 raw bytes always in octal form. Handle sub char table correctly.
4947 * process.c: Include "character.h" instead of "charset.h".
4948 (read_process_output): Adjusted for the new code-conversion API.
4949 (send_process): Likewise.
4951 * puresize.h (BASE_PURESIZE): Increased.
4953 * regex.c: Include "character.h" instead of "charset.h".
4954 (BYTE8_TO_CHAR, CHAR_BYTE8_P) [not emacs]: New dummy macros.
4955 (regex_compile): Accept a range whose starting and ending
4956 character have different leading bytes.
4957 (analyse_first): Adjusted for the above change.
4959 * search.c: Include "character.h" instead of "charset.h".
4960 (search_buffer, boyer_moore): Adjusted for the new multibyte form.
4961 (Freplace_match): Adjusted for the change of
4962 multibyte_char_to_unibyte.
4964 * syntax.c: Include "character.h" instead of "charset.h".
4965 (syntax_parent_lookup): Deleted.
4966 (Fmodify_syntax_entry): Accept a cons as CHAR.
4967 (skip_chars): Adjusted for the new multibyte form.
4968 (init_syntax_once): Call char_table_set_range instead of directly
4969 accessing the structure of a char table.
4971 * syntax.h (SET_RAW_SYNTAX_ENTRY): Call CHAR_TABLE_SET.
4972 (SYNTAX_ENTRY_FOLLOW_PARENT): Macro deleted.
4973 (SET_RAW_SYNTAX_ENTRY_RANGE): New macro.
4974 (SYNTAX_ENTRY_INT): Call CHAR_TABLE_REF.
4976 * term.c: Include "buffer.h" and "character.h".
4977 (encode_terminal_code): Adjusted for the new code-conversion API.
4978 (write_glyphs): Likewise.
4979 (produce_glyphs): Call CHAR_WIDTH instead of CHARSET_WIDTH.
4981 * w32term.c (x_new_font): Adjusted for the change of FS_LOAD_FONT.
4983 * xdisp.c: Include "character.h".
4984 (get_next_display_element): Adjusted for the new multibyte form.
4985 (disp_char_vector): Adjusted for the new char table structure.
4986 (decode_mode_spec_coding): Adjusted for the new structure of
4988 (decode_mode_spec): Adjusted for the new code-conversion API.
4990 * xfaces.c: Include "character.h" instead of "charset.h".
4991 (load_face_font): Adjusted for the change of choose_face_font and
4993 (generate_ascii_font): New function.
4994 (set_lface_from_font_name): Adjusted for the change of
4996 (set_font_frame_param): Adjusted for the change of
4998 (free_realized_face): Make it public.
4999 (free_realized_faces_for_fontset): Renamed from
5000 free_realized_multibyte_face. Free also faces realized for ASCII.
5001 (choose_face_font): Argments changed. Adjusted for the change of
5002 fontset_font_pattern and FS_LOAD_FONT.
5004 * xfns.c: Include "character.h".
5005 (x_encode_text): Adjusted for the new code-conversion API.
5007 * xselect.c: Don't include "charset.h".
5008 (selection_data_to_lisp_data): Adjusted for the new code
5011 * xterm.c: Include "character.h".
5012 (x_encode_char): New argument CHARSET. Caller changed.
5013 (x_get_char_face_and_encoding): Call ENCODE_CHAR instead of
5015 (x_get_glyph_face_and_encoding): Likewise.
5016 (x_produce_glyphs): Don't check Vnonascii_translation_table Call
5017 CHAR_WIDTH instead of CHARSET_WIDTH.
5018 (XTread_socket): Adjusted for the new code-conversion API.
5019 (x_new_font): Adjusted for the change of FS_LOAD_FONT.
5020 (x_load_font): Adjusted for the change of struct font.
5023 ;; coding: iso-2022-7bit
5026 Copyright (C) 2002 Free Software Foundation, Inc.
5027 Copying and distribution of this file, with or without modification,
5028 are permitted provided the copyright notice and this notice are preserved.
5030 ;;; arch-tag: 1bff38bd-2030-46ae-9d18-f15e6006b665