code.delx.au - gnu-emacs/blob - src/ChangeLog.unicode

   1 2007-10-12  Miles Bader  <miles@gnu.org>
   2
   3         * src/dispextern.h (struct glyph_row): Only define "clip" field if
   4         HAVE_WINDOW_SYSTEM is defined.
   5
   6 2007-10-12  Stefan Monnier  <monnier@iro.umontreal.ca>
   7
   8         Fix up multi-tty merge.
   9
  10         * xterm.c (handle_one_xevent): Remove duplicate code and fix up nesting
  11         and indentation.
  12
  13         * xfaces.c (free_realized_face, clear_face_gcs):
  14         Include font_done_for_face in the input_blocked section, just in case.
  15
  16         * xdisp.c (decode_mode_spec): Use terminal-local coding systems.
  17         (get_char_face_and_encoding): Undo last change and remove the *other*
  18         duplicate definition (i.e. keep the one that's better scoped and that
  19         includes code for the font-backend).
  20
  21         * terminal.c (create_terminal): Default keyboard_coding to
  22         `no-conversion' and terminal_coding to `undecided'.
  23
  24         * lread.c (read1): Use XSETPVECTYPE to set a pseudovector's tag.
  25
  26         * fontset.c (free_realized_fontsets): Check that the table entry does
  27         contain a fontset before trying to compare it to `base'.
  28
  29         * emacs.c (main): Move syms_of_data, syms_of_fileio, syms_of_alloc,
  30         syms_of_charset, and syms_of_coding earlier because init_window_once
  31         now needs Vcoding_system_hash_table to be setup.
  32
  33         * coding.h (default_buffer_file_coding): Remove.
  34
  35         * coding.c (default_buffer_file_coding): Remove.
  36         (Fterminal_coding_system, Fkeyboard_coding_system): Use ->id rather
  37         than ->symbol, and use the terminal-local coding system.
  38         (syms_of_coding): Don't setup the coding-systems that are not
  39         terminal-local.
  40         (Fdefine_coding_system_internal): Use XCAR/XCDR.
  41
  42         * chartab.c (Fmake_char_table, make_sub_char_table, copy_char_table):
  43         Use XSETPVECTYPE now that XSETCHAR_TABLE doesn't set the tag anymore.
  44
  45         * alloc.c (Fmake_char_table, make_sub_char_table): Remove.  They're now
  46         in chartab.c and were re-added here by mistake.
  47         (Fpurecopy): Use XSETPVECTYPE after copying a COMPILED pseudovector.
  48
  49         * doc.c (Fsnarf_documentation):
  50         * Makefile.in (temacs${EXEEXT}, mostlyclean): Move buildobj.lst from
  51         src to etc.
  52
  53         * ChangeLog.10: Add mistakenly removed entry.
  54
  55 2007-10-12  Dan Nicolaescu  <dann@ics.uci.edu>
  56
  57         * Makefile.in (fringe.o, minibuf.o): Fix dependencies.
  58
  59 2007-10-11  Miles Bader  <miles@gnu.org>
  60
  61         * xdisp.c (get_char_face_and_encoding): Remove extraneous definition.
  62         Add extra args to FACE_FOR_CHAR.
  63
  64 2007-09-20  Kenichi Handa  <handa@m17n.org>
  65
  66         * keymap.c (where_is_internal_1): If key is a cons, store the copy
  67         in sequence.
  68
  69         * chartab.c (map_sub_char_table): If the range contains just one
  70         character, call the function with that character even if the depth
  71         is not 3.
  72         (map_char_table): Likewise.
  73
  74 2007-09-19  Jason Rumney  <jasonr@gnu.org>
  75
  76         * w32font.c (w32font_text_extents): Calculate metrics for the
  77         whole string.
  78
  79 2007-09-15  Jason Rumney  <jasonr@gnu.org>
  80
  81         * w32xfns.c (get_next_msg): Consolidate WM_PAINT messages.
  82
  83 2007-09-13  Jason Rumney  <jasonr@gnu.org>
  84
  85         * w32term.c (x_set_glyph_string_clipping): Use
  86         get_glyph_string_clip_rects.
  87         (x_set_glyph_string_clipping_exactly): Adjusted for the change of
  88         struct glyph_string.
  89         (x_draw_glyph_string): Likewise.
  90
  91         * w32font.c (w32font_draw): Do clipping here.
  92
  93 2007-09-13  Kenichi Handa  <handa@m17n.org>
  94
  95         * xftfont.c (xftfont_draw): Adjusted for the change of struct
  96         glyph_string.
  97
  98         * xterm.c (x_set_glyph_string_clipping): Use
  99         get_glyph_string_clip_rects.
 100         (x_set_glyph_string_clipping_exactly): Adjusted for the change of
 101         struct glyph_string.
 102         (x_draw_glyph_string): Likewise.
 103
 104         * xdisp.c (get_glyph_string_clip_rects): Reflect s->row->clip to
 105         the resulting clip(s}.
 106         (expose_overlaps): Add arg r.  Callers changed.  Set it ot
 107         row->clip temporarily.
 108         (expose_window): Redraw rows overlapping the exposed area.
 109
 110         * dispextern.h (struct glyph_row): New member clip.
 111         (struct glyph_string): Delete members clip_x, clip_y, clip_width,
 112         clip_height, new member clip, and num_clips.
 113
 114 2007-09-07  Kenichi Handa  <handa@m17n.org>
 115
 116         * data.c (Fchar_or_string_p): Fix docstring.
 117
 118 2007-08-22  Kenichi Handa  <handa@m17n.org>
 119
 120         * xftfont.c (xftfont_draw): If s->font_info != s->face->font_info,
 121         create a temporal XftDraw object.
 122
 123 2007-07-26  Kenichi Handa  <handa@m17n.org>
 124
 125         * font.c (Ffontp): Fix docstring.
 126
 127         * coding.c (detect_coding_iso_2022): Don't treat SI/SO codes as a
 128         strong evidence of ISO-2022.
 129
 130 2007-07-23  Kenichi Handa  <handa@m17n.org>
 131
 132         * abbrev.c (abbrev_check_chars): Use CHAR_TABLE_REF, not
 133         SYNTAX_ENTRY_FOLLOW_PARENT.
 134
 135 2007-06-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 136
 137         * fns.c (weak_hash_tables): Rename from Vweak_hash_tables and change
 138         its type.
 139         (make_hash_table, copy_hash_table, sweep_weak_hash_tables, init_fns):
 140         Update to the new type of weak_hash_tables and next_weak.
 141
 142         * lisp.h (struct Lisp_Hash_Table): Change next_weak from Lisp_Object to
 143         a plain C pointer to Lisp_Hash_Table.
 144
 145         * lisp.h (XGCTYPE, GC_HASH_TABLE_P, GC_NILP, GC_NUMBERP, GC_NATNUMP)
 146         (GC_INTEGERP, GC_SYMBOLP, GC_MISCP, GC_VECTORLIKEP, GC_STRINGP)
 147         (GC_CONSP, GC_FLOATP, GC_VECTORP, GC_OVERLAYP, GC_MARKERP)
 148         (GC_INTFWDP, GC_BOOLFWDP, GC_OBJFWDP, GC_BUFFER_OBJFWDP)
 149         (GC_BUFFER_LOCAL_VALUEP, GC_SOME_BUFFER_LOCAL_VALUEP)
 150         (GC_KBOARD_OBJFWDP, GC_PSEUDOVECTORP, GC_WINDOW_CONFIGURATIONP)
 151         (GC_PROCESSP, GC_WINDOWP, GC_SUBRP, GC_COMPILEDP, GC_BUFFERP)
 152         (GC_SUB_CHAR_TABLE_P, GC_CHAR_TABLE_P, GC_BOOL_VECTOR_P, GC_FRAMEP)
 153         (GC_EQ): Remove since they've been identical to their non-GC_
 154         alter-egos ever since the markbit was eradicated.
 155
 156         * src/alloc.c:
 157         * src/buffer.c:
 158         * src/buffer.h:
 159         * src/data.c:
 160         * src/fileio.c:
 161         * src/filelock.c:
 162         * src/fns.c:
 163         * src/frame.h:
 164         * src/lisp.h:
 165         * src/macterm.c:
 166         * src/print.c:
 167         * src/process.c:
 168         * src/w32fns.c:
 169         * src/w32menu.c:
 170         * src/w32term.c:
 171         * src/xfns.c:
 172         * src/xmenu.c:
 173         * src/xterm.c: Replace uses of GC_* macros with the non-GC_ versions.
 174
 175 2007-06-25  Kenichi Handa  <handa@m17n.org>
 176
 177         * chartab.c (map_sub_char_table): Make it work for the top-level
 178         char-table.  Fix handling of parent char-table.
 179         (map_char_table):  Adjust for the above change.
 180
 181 2007-06-24  Jason Rumney  <jasonr@gnu.org>
 182
 183         * w32font.c (Qgdi): Rename from Qw32.
 184
 185 2007-06-22  Jason Rumney  <jasonr@gnu.org>
 186
 187         * w32bdf.c (get_quoted_string): Make function static.
 188
 189 2007-06-20  Kenichi Handa  <handa@m17n.org>
 190
 191         * xftfont.c (xftfont_open): If one of font's ASCII glyph has
 192         bigger ascent and descent than those of the font, use them as
 193         font's ascent and descent.
 194
 195 2007-06-18  Kenichi Handa  <handa@m17n.org>
 196
 197         * Makefile.in (${lispsource}international/charprop.el): Move this
 198         target within "#ifdef HAVE_UNIDATA" and "#endif".
 199
 200 2007-06-16  Kenichi Handa  <handa@m17n.org>
 201
 202         * Makefile.in (lisp): Add ${lispsource}language/tai-viet.el.
 203         (shortlisp): Add ../lisp/language/tai-viet.el.
 204
 205 2007-06-15  Ulrich Mueller  <ulm@gentoo.org>  (tiny change)
 206
 207         * Makefile.in (${lispsource}international/charprop.el): Depend on
 208         temacs${EXEEXT}.
 209
 210 2007-06-13  Jason Rumney  <jasonr@gnu.org>
 211
 212         * w32font.c (w32font_close): Delete the GDI font object.
 213
 214         * w32menu.c: Include character.h
 215
 216         * w32proc.c: Likewise.
 217
 218         * w32select.c: Likewise.
 219
 220         * makefile.w32-in (w32proc.o): Depend on character.h
 221
 222 2007-06-11  Jason Rumney  <jasonr@gnu.org>
 223
 224         * w32fns.c (syms_of_w32fns): Use DEFSYM macro.
 225
 226         * w32menu.c (syms_of_w32menu): Likewise.
 227
 228         * w32proc.c (syms_of_ntproc): Likewise.
 229
 230         * w32select.c (syms_of_w32select): Likewise.
 231
 232         * w32term.c (syms_of_w32term): Likewise.
 233
 234 2007-06-06  Jason Rumney  <jasonr@gnu.org>
 235
 236         * w32font.c (w32font_draw): Delete brush after using it.
 237
 238 2007-06-04  Jason Rumney  <jasonr@gnu.org>
 239
 240         * w32font.c (w32font_open): Don't set font_idx.
 241         (w32font_text_extents): Try GetTextExtentPoint32W before defaulting
 242         to font settings.
 243         (w32font_draw): Fill background explicitly.
 244
 245 2007-06-03  Jason Rumney  <jasonr@gnu.org>
 246
 247         * w32term.c (w32_initialize): Don't call w32font_initialize.
 248
 249         * w32font.c (w32font_info): Remove subranges.
 250         (QCsubranges, Qmodern, Qswiss, Qroman): Remove.
 251         (QCfamily, Qmonospace, Qsans_serif, Qmono, Qsans, Qsans__serif)
 252         (Qraster, Qoutline, Qlatin, Qgreek, Qcoptic, Qcyrillic, Qarmenian)
 253         (Qhebrew, Qarabic, Qsyriac, Qnko, Qthaana, Qdevanagari, Qbengali)
 254         (Qgurmukhi, Qgujarati, Qoriya, Qtamil, Qtelugu, Qkannada)
 255         (Qmalayalam, Qsinhala, Qthai, Qlao, Qtibetan, Qmyanmar, Qgeorgian)
 256         (Qhangul, Qethiopic, Qcherokee, Qcanadian_aboriginal, Qogham)
 257         (Qrunic, Qkhmer, Qmongolian, Qsymbol, Qbraille, Qhan)
 258         (Qideographic_description, Qcjk_misc, Qkana, Qbopomofo, Qkanbun)
 259         (Qyi, Qbyzantine_musical_symbol, Qmusical_symbol, Qmathematical):
 260         New symbols.
 261         (font_callback_data): New struct.
 262         (w32font_list, w32font_match): Use it.
 263         (w32font_open): Don't populate subranges.
 264         (w32font_has_char): Use script Lisp symbols, not subrange bitmask.
 265         (w32font_encode_char): Always return unicode code-point as-is.
 266         (w32font_text_extents): Supply a tranformation matrix to
 267         GetGlyphOutline. Never look up by glyph index. Avoid looping
 268         twice. Use unicode version of GetTexExtentPoint32 instead of
 269         glyph index version.
 270         (set_fonts_frame): Remove
 271         (w32_enumfont_pattern_entity): Add frame parameter, use it to
 272         set frame parameter. Use backward compatible fake foundries.
 273         Save generic family in extra slot under QCfamily. Make width slot
 274         constant. Save QCspacing value. Save list of scripts instead of
 275         binary subranges.
 276         (w32_generic_family, logfonts_match, font_matches_spec): New functions.
 277         (add_font_entity_to_list): Use font_callback_data struct. Filter
 278         unwanted fonts.
 279         (add_one_font_entity_to_list): Use font_callback_data struct.
 280         (w32_registry): Default to iso10646_1;
 281         (fill_in_logfont): Use dpi from extra slot. Don't bother with
 282         string font registries. Don't fill in font name if it is a generic
 283         family name, fill family instead. Use spacing, family and script
 284         extra info to fill pitch, family and charset fields.
 285         (list_all_matching_fonts): Use font_callback_data struct.
 286         (unicode_range_for_char): Remove.
 287         (font_supported_scripts): New function.
 288         (w32font_initialize): Remove.
 289         (syms_of_w32font): Update which symbols are defined.
 290
 291 2007-06-02  Jason Rumney  <jasonr@gnu.org>
 292
 293         * font.c (font_pixel_size): Reverse assq_no_quit args.
 294
 295         * w32term.h (FONT_WIDTH): Report max width, not average.
 296         (FONT_MAX_WIDTH): Remove.
 297         (FONT_AVG_WIDTH): New macro.
 298
 299         * xfaces.c (Fx_list_fonts) [WINDOWSNT]: Remove Windows only
 300         redefinition of FONT_WIDTH.
 301
 302         * w32term.c (x_font_min_bounds): Use FONT_AVG_WIDTH.
 303         (w32_cache_char_metrics): Use FONT_WIDTH.
 304
 305         * w32fns.c (w32_load_system_font, w32_list_fonts): Use FONT_AVG_WIDTH.
 306
 307 2007-06-01  Jason Rumney  <jasonr@gnu.org>
 308
 309         * w32font.c (w32font_open): Make lfHeight negative.
 310
 311         * w32fns.c (x_default_font_parameter): Use new style font name.
 312         (Fx_create_frame, x_create_tip_frame): Initialize resx and resy.
 313
 314 2007-05-31  Jason Rumney  <jasonr@gnu.org>
 315
 316         * w32font.c (QCsubranges): New symbol.
 317         (w32font_open, w32font_has_char): Get subranges from subproperty
 318         of extra.
 319         (w32_enumfont_pattern_entity): Set subranges as subproperty of extra.
 320         (syms_of_w32font): Define :subranges symbol.
 321
 322         * font.c (font_put_extra): Expose externally.
 323
 324         * font.h (font_put_extra): Moved declaration from font.c.
 325
 326         * font.c (Ffont_get): Use font driver to determine otf capability.
 327         (adjust_anchor): Check if driver defines anchor_point before using.
 328
 329         * w32font.c (w32font_open): Handle size, height and pixel_size better.
 330         (w32font_draw): Use options.
 331         (w32_enumfont_pattern_entity): Set size to 0 for scalable fonts.
 332         Fix detection of truetype fonts.
 333         (registry_to_w32_charset): Handle charsets other than iso8859-1
 334         expressed as lisp symbols.
 335         (w32_registry): Express charset as lisp symbol.
 336         (fill_in_logfont): Reverse pixel and point height logic.
 337         Don't set width here. Set quality to default.
 338
 339         * w32fns.c (w32_load_system_font): Fix detecting FIXED_PITCH fonts.
 340         (x_to_w32_font): Fill in lfPitchAndFamily correctly.
 341
 342         * xterm.c (x_draw_glyph_string_foreground) [USE_FONT_BACKEND]:
 343         Remove redundant loop and allocation.
 344
 345         * makefile.w32-in (font.o, w32font.o): New objects.
 346         (fontset.o, xdisp.o, xfaces.o, w32fns.o, w32term.o): Depend on font.h
 347         (FONTOBJ): New group of objects conditioned on USE_FONT_BACKEND.
 348
 349         * xdisp.c (fill_composite_glyph_string): Make the first arg to
 350         STORE_XCHARB a valid l-value.
 351
 352         * w32term.c (w32_native_per_char_metric): Swap width and rbearing
 353         calculations for non-Truetype fonts.
 354         (x_draw_glyph_string): Sync with xterm.c.
 355         (x_draw_glyph_string_foreground) [USE_FONT_BACKEND]: Remove
 356         redundant code.
 357         (w32_initialize) [USE_FONT_BACKEND]: Call w32font_initialize.
 358
 359         * w32term.h (w32_output_data) [USE_FONT_BACKEND]: Add fontp member.
 360         (FRAME_FONT_OBJECT) [USE_FONT_BACKEND]: New macro from xterm.h.
 361
 362         * w32fns.c [USE_FONT_BACKEND]: Port font backend changes from xfns.c.
 363         (x_to_w32_charset, w32_to_x_charset): Expose externally.
 364
 365         * w32font.c: New file for w32 font backend.
 366
 367 2007-05-28  Kenichi Handa  <handa@m17n.org>
 368
 369         * term.c: Don't include "buffer.h" twice.
 370
 371 2007-05-21  Kenichi Handa  <handa@m17n.org>
 372
 373         * syntax.c (skip_syntaxes): Synch with the trunk.
 374
 375 2007-05-14  Kenichi Handa  <handa@m17n.org>
 376
 377         * character.c (Funibyte_string): New function.
 378         (syms_of_character): Defsubr it.
 379
 380 2007-05-01  Jason Rumney  <jasonr@gnu.org>
 381
 382         * w32term.c [USE_FONT_BACKEND]:
 383         (x_get_font_repertory, note_mouse_movement, x_set_mouse_face_gc):
 384         (x_set_glyph_string_clipping, x_set_glyph_string_clipping_exactly):
 385         (x_draw_glyph_string, x_draw_glyph_string_foreground):
 386         (x_draw_composite_glyph_string_foreground, x_new_fontset2):
 387         (x_free_frame_resources): Sync with xterm.c.
 388
 389 2007-04-29  Andreas Schwab  <schwab@suse.de>
 390
 391         * lread.c (read1): Use CHAR_TABLE_STANDARD_SLOTS to validate
 392         char-table size.
 393
 394 2007-04-26  Kenichi Handa  <handa@m17n.org>
 395
 396         * font.c (check_otf_features): Define it regardless of
 397         HAVE_LIBOTF.
 398
 399 2007-04-25  Kenichi Handa  <handa@m17n.org>
 400
 401         * ftfont.c (ftfont_driver): Delete font_otf_gsub and
 402         font_otf_gpos, add font_drive_otf.
 403
 404         * fontset.c (fontset_find_font): Pay attention to font size
 405         specified for a font.
 406         (reorder_font_vector): Check contents of font_def.
 407
 408         * font.c (struct otf_list): Delete it.
 409         (otf_list): Make it a lisp variable..
 410         (otf_open): Use lispy otf_list.
 411         (generate_otf_features): Renamed from parse_gsub_gpos_spec.
 412         (check_otf_features): New function.
 413         (font_otf_DeviceTable, font_otf_ValueRecord, font_otf_Anchor): New
 414         functinos.
 415         (font_drive_otf): New function merging font_otf_gsub and
 416         font_otf_gpos.
 417         (font_open_for_lface): New arg spec.  Change argument order.
 418         (font_load_for_face): Adjusted for the change of
 419         font_open_for_lface.
 420         (Ffont_drive_otf): New function merging Ffont_otf_gsub and
 421         Ffont_otf_gpos.
 422         (syms_of_font): Staticpro otf_list.  Delete defsubr of
 423         Sfont_otf_gsub and Sfont_otf_gpos.  Defsubr Sfont_drive_otf.
 424
 425         * xfaces.c (set_font_frame_param): Adjusted for the change of
 426         font_open_for_lface.
 427
 428         * font.h (font_open_for_lface): Adjust prototype.
 429         (struct font_driver): Delete members otf_gsub and otf_gpos, add
 430         member otf_drive.
 431         (font_otf_gsub, font_otf_gpos): Delete externs.
 432         (font_drive_otf): Extern it.
 433
 434 2007-04-24  Kenichi Handa  <handa@m17n.org>
 435
 436         * font.c (font_at): If the window W is not on a window system,
 437         return Qnil.
 438
 439         * coding.c (produce_chars): Don't call insert_from_gap if no
 440         characters to produce.
 441         (encode_coding): Likewise.
 442
 443 2007-04-17  Kenichi Handa  <handa@m17n.org>
 444
 445         * fontset.c (free_realized_fontsets): Avoid unnecessary call of
 446         Fclear_face_cache.
 447
 448         * xfaces.c (face_for_font): Check also face->font==font->font.font.
 449
 450 2007-04-16  Miles Bader  <miles@gnu.org>
 451
 452         * emacs.c (main): Change default value of `enable_font_backend' to 1.
 453         Parse "--disable-font-backend" option.
 454         (standard_args): Add "--disable-font-backend" option.
 455
 456 2007-04-13  Kenichi Handa  <handa@m17n.org>
 457
 458         * fontset.c (fontset_find_font): New function.
 459         (fontset_font): Use fontset_find_font.
 460         (make_fontset_for_ascii_face): Don't set face ID in rfont_def.
 461         Register the specified font for all Latin characters.
 462         (new_fontset_from_font): Register the specified font for all Latin
 463         characters.
 464         (dump_fontset): For a realized fontset, include the base fontset
 465         name in the returned vector.
 466
 467 2007-04-11  Kenichi Handa  <handa@m17n.org>
 468
 469         * character.h (CHAR_STRING): Cast C to unsigned on calling
 470         char_string.
 471
 472         * character.c (char_string): Type of arg C changed to unsigned.
 473         Signal an error if C is an invalid character code.
 474
 475         * editfns.c (general_insert_function): Use CHARACTERP, not INTEGERP.
 476         (Fchar_to_string): Likewise.
 477
 478 2007-03-23  Kenichi Handa  <handa@m17n.org>
 479
 480         * character.h (MIN_MULTIBYTE_LEADING_CODE)
 481         (MAX_MULTIBYTE_LEADING_CODE): New macros.
 482
 483         * regex.c (analyse_first): Fix for multibyte characters in "case
 484         charset:" and "case categoryspec:".
 485
 486 2007-03-04  Andreas Schwab  <schwab@suse.de>
 487
 488         * Makefile.in (LIBES): Move standard libraries to the end.
 489
 490 2007-02-27  Kenichi Handa  <handa@m17n.org>
 491
 492         * process.c: Cancel the change done by sync with HEAD.
 493
 494 2007-02-23  Kenichi Handa  <handa@m17n.org>
 495
 496         * alloc.c (Fgarbage_collect): If nextb->text->inhibit_shrinking is
 497         nonzero, don't shrink the buffer nextb.
 498
 499         * buffer.h (struct buffer_text): New member inhibit_shrinking.
 500
 501         * coding.c (coding_alloc_by_making_gap): New arg offset.
 502         (alloc_destination): Call coding_alloc_by_making_gap with the arg
 503         offset.
 504         (decode_coding_iso_2022): Update coding->safe_charsets.
 505         (decode_coding_gap): Temporarily set
 506         current_buffer->text->inhibit_shrinking to 1.
 507
 508 2007-02-20  Kenichi Handa  <handa@m17n.org>
 509
 510         * xterm.c (x_draw_composite_glyph_string_foreground): Fix
 511         indexing into elements of s->cmp and s->char2b.
 512
 513 2007-02-16  Juanma Barranquero  <lekktu@gmail.com>
 514
 515         * regex.c (RE_STRING_CHAR_AND_LENGTH) [! emacs]: Add missing arg `len'.
 516
 517 2007-02-16  Kenichi Handa  <handa@m17n.org>
 518
 519         * regex.c (GET_CHAR_BEFORE_2, GET_CHAR_AFTER): Check the variable
 520         target_multibyte instead of multibyte.
 521         (re_match_2_internal): Call bcmp_translate with target_multibyte.
 522         (bcmp_translate): Change the argument name from multibyte to
 523         target_multibyte.
 524
 525 2007-02-15  Kenichi Handa  <handa@m17n.org>
 526
 527         These changes are to compile a regexp into a pattern that can be
 528         used both for multibyte and unibyte targets.
 529
 530         * Makefile.in (search.o): Depend on charset.h.
 531
 532         * character.c (multibyte_char_to_unibyte_safe): New function.
 533
 534         * search.c: Include "charset.h".
 535         (compile_pattern_1): Delete argument multibyte.  Don't set
 536         cp->buf.target_multibyte here.  Set cp->buf.charset_unibyte.
 537         (compile_pattern): Don't compare cp->buf.target_multibyte.
 538         Compare cp->buf.charset_unibyte.
 539         (compile_pattern): Set cp->buf.target_multibyte.
 540
 541         * lisp.h (multibyte_char_to_unibyte_safe): Extern it.
 542
 543         * regex.h (struct re_pattern_buffer): New member charset_unibyte.
 544
 545         * regex.c (RE_STRING_CHAR, RE_STRING_CHAR_AND_LENGTH): New arg
 546         multibyte.  Callers changed.
 547         (RE_CHAR_TO_MULTIBYTE, RE_CHAR_TO_UNIBYTE): New macros.
 548         (MAKE_CHAR_MULTIBYTE, MAKE_CHAR_UNIBYTE): Deleted.  Callers
 549         changed to use RE_CHAR_TO_MULTIBYTE and RE_CHAR_TO_UNIBYTE
 550         respectively.
 551         (SETUP_ASCII_RANGE, SETUP_UNIBYTE_RANGE): New macros.
 552         (SETUP_MULTIBYTE_RANGE): Generate a more compact range_table.
 553         (regex_compile): Make the compiled pattern usable both for
 554         multibyte and unibyte targets.
 555         (analyse_first): Make the fastmap usable both for multibyte and
 556         unibyte targets.
 557         (TRANSLATE_VIA_MULTIBYTE): Deleted.
 558         (re_match_2_internal): Pay attention to the case that the
 559         multibyteness of bufp and target may be different.
 560
 561 2007-02-14  Kenichi Handa  <handa@m17n.org>
 562
 563         * xdisp.c (x_produce_glyphs): When a font is not found, make the
 564         empty box occupy at least one column width.
 565
 566 2007-01-30  Miles Bader  <miles@gnu.org>
 567
 568         * Makefile.in: Remove redundant HAVE_XFT clause.
 569
 570 2006-12-20  Kenichi Handa  <handa@m17n.org>
 571
 572         * xrdb.c (x_load_resources): Setup the default fontSet X reource.
 573
 574 2006-12-15  Kenichi Handa  <handa@m17n.org>
 575
 576         * regex.c (regex_compile): Synch with HEAD.
 577
 578 2006-12-12  Kenichi Handa  <handa@m17n.org>
 579
 580         * fontset.c (Finternal_char_font): Fix previous change.
 581
 582 2006-12-07  Kenichi Handa  <handa@m17n.org>
 583
 584         * fontset.c (Finternal_char_font): Fix for the case of POSITION
 585         being nil.
 586
 587 2006-12-06  Kenichi Handa  <handa@m17n.org>
 588
 589         * xftfont.c (xftfont_open): Call FcConfigSubstitute.
 590
 591 2006-12-05  Kenichi Handa  <handa@m17n.org>
 592
 593         * xftfont.c (xftfont_open): Don't enable antialias explicitly.
 594
 595 2006-11-30  Kenichi Handa  <handa@m17n.org>
 596
 597         * search.c (simple_search): Fix previous change.
 598
 599 2006-11-29  Kenichi Handa  <handa@m17n.org>
 600
 601         * xftfont.c (ftfont_font_format): Extern declaration.
 602
 603         * frame.c (x_set_font): Fix the second arg to fs_query_fontset.
 604
 605         * xfont.c (xfont_driver): Initialize ftfont_driver.type by 0.
 606         (xfont_list): Don't directly use Lisp_Object as an operand of &&.
 607
 608         * ftfont.c (ftfont_driver): Initialize ftfont_driver.type by 0.
 609         (ftfont_font_format): Fix previous change.
 610
 611         * font.h (Ffont_xlfd_name): EXFUN it.
 612
 613         * font.c (font_parse_xlfd): Fix the array size of `f'.
 614         (register_font_driver): Use EQ to compare driver->type.
 615
 616         * xfns.c (xic_create_xfontset2) [USE_FONT_BACKEND]: New function.
 617         (create_frame_xic) [USE_FONT_BACKEND]: Call xic_create_xfontset2.
 618         (xic_set_xfontset) [USE_FONT_BACKEND]: Likewise.
 619
 620 2006-11-27  Kenichi Handa  <handa@m17n.org>
 621
 622         * ftfont.c (ftfont_pattern_entity): Check if FC_FONTFORMAT is
 623         defined.
 624         (ftfont_list_generic_family, ftfont_list, ftfont_font_format):
 625         Likewise.
 626
 627 2006-11-24  Kenichi Handa  <handa@m17n.org>
 628
 629         * xfont.c (xfont_open): Set font->format.
 630
 631         * xftfont.c (xftfont_open): Set font->format.
 632
 633         * ftfont.c (ftfont_pattern_entity): Add fontformat in a pattern.
 634         (ftfont_list): Include FC_FONTFORMAT in FcObject.
 635         (ftfont_open): Set font->format.
 636         (ftfont_font_format): New function.
 637
 638         * font.h (struct font): New memeber format.
 639
 640         * font.c (Qopentype): New variable.
 641         (syms_of_font): Defsym it.
 642         (Fquery_font): Change the format of the last element of the return
 643         value.
 644
 645 2006-11-22  Kenichi Handa  <handa@m17n.org>
 646
 647         * search.c (simple_search): Fix sync with HEAD.
 648
 649 2006-11-17  Kenichi Handa  <handa@m17n.org>
 650
 651         * xfns.c (xic_create_xfontset): Try the default fontset name as a
 652         last resort.
 653
 654 2006-11-08  Kenichi Handa  <handa@m17n.org>
 655
 656         * coding.c (detect_coding_charset): Fix detection of multi-byte
 657         charset.
 658
 659 2006-11-07  Bob Halley  <halley@play-bow.org>  (tiny change)
 660
 661         * ccl.c (ccl_driver): If DST is NULL, set ccl->produced to 0.
 662
 663 2006-10-31  Kenichi Handa  <handa@m17n.org>
 664
 665         * xdisp.c (get_next_display_element): Set it->face_id for the
 666         first component of a composition.
 667         (x_produce_glyphs): Check if the font is changed or not for
 668         composition.
 669
 670 2006-10-31  Kenichi Handa  <handa@m17n.org>
 671
 672         (get_next_display_element): Set it->face_id for the
 673         first component of a composition.
 674         (x_produce_glyphs): Check if the font is changed or not for
 675         composition.
 676
 677 2006-10-30  Kenichi Handa  <handa@m17n.org>
 678
 679         * fontset.c (Qlatin): New variable.
 680         (syms_of_fontset): Define it as a lisp symbol.
 681         (Fset_fontset_font): If TARGET is `latin', use FONT_SPEC for
 682         ASCII.
 683
 684 2006-10-27  Kenichi Handa  <handa@m17n.org>
 685
 686         * font.c (font_unparse_fcname): Pay attention to the case that
 687         some of font property is a null string.
 688
 689 2006-10-26  Kenichi Handa  <handa@m17n.org>
 690
 691         * term.c: Include "composite.h".
 692         (encode_terminal_code): Output all components of composition.
 693         Check the size of encode_terminal_src.
 694         (produce_glyphs): For compostion, call produce_composite_glyph.
 695         (append_composite_glyph, produce_composite_glyph): New functions.
 696
 697         * xdisp.c (x_produce_glyphs): In handling composition, if a font
 698         is not found, get font_info from the current ascii face.
 699
 700 2006-10-23  Kenichi Handa  <handa@m17n.org>
 701
 702         * fileio.c (Finsert_file_contents): On replacing, temporarily bind
 703         buffer-file-name to Qnil before calling insert_from_buffer.
 704
 705         * font.c (font_unparse_fcname): Pay attention to the case that
 706         foundry is a null string.
 707
 708 2006-10-17  Kenichi Handa  <handa@m17n.org>
 709
 710         * ftfont.c (ftfont_list): Allow registry "unicode-sip".
 711
 712         * font.c (Qunicode_sip): New variable.
 713         (syms_of_font): Declare it as a Lisp symbol.
 714
 715         * font.h (Qunicode_sip): Extern it.
 716
 717 2006-10-16  Kenichi Handa  <handa@m17n.org>
 718
 719         * composite.c (get_composition_id): Pay attention to TAB
 720         component.
 721
 722         * xterm.c (x_draw_composite_glyph_string_foreground): Don't draw
 723         TAB.  Adjusted for the change of s->char2b which always points to
 724         the first elememnt of allocated memory.
 725
 726         * xftfont.c (xftfont_text_extents): Fix calculation of descent
 727         value.
 728
 729         * xdisp.c (handle_composition_prop): Set it->c to the first
 730         non-TAB component.
 731         (fill_composite_glyph_string): Argument changed.
 732         (BUILD_COMPOSITE_GLYPH_STRING): Adjusted for the above change.
 733         (x_produce_glyphs): Fix handling of left/right padding.
 734
 735 2006-10-04  Kenichi Handa  <handa@m17n.org>
 736
 737         * regex.c (analyse_first): Cancel the change for synching with
 738         HEAD.
 739
 740 2006-08-28  Kenichi Handa  <handa@m17n.org>
 741
 742         * coding.c (detect_coding_system): Fix for handling off
 743         inhibit_iso_escape_detection.  Fix for the case that no coding
 744         system is defined for a specific coding category.
 745
 746 2006-08-21  Kenichi Handa  <handa@m17n.org>
 747
 748         * font.c (font_matching_entity): Dolete unused local var.
 749
 750         * xftfont.c (xftfont_open): Call XftDefaultSubstitute before
 751         opening a font.
 752
 753         * fileio.c (Finsert_file_contents): On recovering a file, assume
 754         Unix-like eol.
 755         (choose_write_coding_system): On auto-saving a file, force
 756         Unix-like eol.
 757
 758         * coding.c (setup_coding_system): Fix setting of
 759         coding->common_flags based on eol_type.
 760         (coding_inherit_eol_type): If PARENT is not nil, be sure to
 761         inherit from it.
 762
 763 2006-08-04  Kenichi Handa  <handa@m17n.org>
 764
 765         * alloc.c (NSTATICS): Increased to 0x600.
 766
 767 2006-08-01  Kenichi Handa  <handa@m17n.org>
 768
 769         * ftfont.c (ftfont_driver): Set ftfont_driver.match to
 770         ftfont_match.
 771         (ftfont_list): Don't check :name property.
 772         (ftfont_match): New function.
 773         (ftfont_pattern_entity): If the pattern doesn't contain
 774         FC_SPACING, don't assuce FC_MONO.
 775
 776         * font.h (struct font_driver): New member `match'.
 777         (font_update_drivers): Prototype adjusted.
 778
 779         * font.c (font_parse_fcname): Don't change :name property of FONT.
 780         (font_parse_name): Likewise.
 781         (LGSTRING_HEADER_SIZE, LGSTRING_GLYPH_SIZE, check_gstring): Define
 782         them unconditionally.
 783         (font_matching_entity): New function.
 784         (font_open_by_name): Try font_matching_entity if exact match is
 785         not found.
 786         (font_update_drivers): Delete the arg FONT.  Return a list of
 787         actually used backends.  Don't free faces, font caches here.
 788         Don't store data in frame parameters.  Don't call x_set_font.
 789         (Ffont_spec): Store :name property as is.
 790         (Ffont_get): Check HAVE_LIBOTF before calling font_otf_capability.
 791         (Ffont_otf_gsub): Call font->driver->otf_gsub instead of
 792         font_otf_gsub.
 793         (Ffont_otf_gpos): Call font->driver->otf_gpos instead of
 794         font_otf_gpos.
 795         (Ffont_otf_alternates): Check if the driver has otf_gsub function.
 796         Call font->driver->otf_gsub instead of font_otf_gsub.
 797
 798         * frame.c (x_set_font_backend): Do more works that were done in
 799         font_update_drivers before.
 800
 801         * xfont.c (xfont_match): New function.
 802         (xfont_driver): Set xfont_driver.match to xfont_match.
 803         (xfont_draw): Set font in GC if necessary.
 804
 805         * ftxfont.c (ftxfont_match): New function.
 806         (syms_of_ftxfont): Set ftxfont_driver.match to ftxfont_match.
 807
 808         * xftfont.c (xftfont_match): New function.
 809         (syms_of_xftfont): Set xftfont_driver.match to xftfont_match.
 810
 811 2006-07-28  Kenichi Handa  <handa@m17n.org>
 812
 813         * font.h (struct font): New member scalable.
 814         (struct font_driver): New arg ALTERANTE_SUBST to otf_gsub.
 815         (font_otf_gsub): Prototype adjusted.
 816
 817         * font.c (font_otf_capability): Fix handling of the default
 818         langsys.
 819         (parse_gsub_gpos_spec): Type changed to void.  New arg nbytes.
 820         Check the contents of SPEC.
 821         (LGSTRING_HEADER_SIZE, LGSTRING_GLYPH_SIZE): New macros.
 822         (check_gstring): New function.
 823         (REPLACEMENT_CHARACTER): New macro.
 824         (font_otf_gsub): New arg alternate_subst.  Be sure to set all
 825         glyph codes of GSTRING.
 826         (font_otf_gpos): Be sure to set all glyph codes of GSTRING.
 827         (font_prepare_composition): Set cmp->glyph_len.
 828         (font_open_entity): Set font->scalable.
 829         (Ffont_get): Handle :otf property.
 830         (Ffont_otf_gsub, Ffont_otf_gpos, Ffont_otf_alternates): New
 831         functions.
 832         (Fquery_font): Use font->font.full_name.
 833         (syms_of_font): Defsubr Sfont_otf_gsub, Sfont_otf_gpos, and
 834         Sfont_otf_alternates.
 835
 836         * ftfont.c (ftfont_open): Set font->font.full_name and
 837         font->font.name properly.  Fix calculation of font->font.height
 838         and font->min_width.
 839
 840         * ftxfont.c (ftxfont_create_gcs): New function.
 841         (ftxfont_draw_bitmap): Fix arg to ftfont_driver.get_bitmap.
 842         (ftxfont_draw_backgrond): Fix filling region.
 843         (ftxfont_default_fid): New function.
 844         (ftxfont_open): Set xfotn->fid to the return value of
 845         ftxfont_default_fid.
 846         (ftxfont_prepare_face): Use ftxfont_create_gcs to create GCs.
 847         (ftxfont_done_face): Free only GCs that are created by
 848         ftxfont_create_gcs.
 849         (ftxfont_draw): If face->gc != s->gc, create proper GCs.
 850
 851         * xterm.c (x_set_glyph_string_clipping_exactly) [USE_FONT_BACKEND]:
 852         Clip to src->width, etc (not src->clip_XXX).
 853
 854         * xfns.c (x_create_tip_frame) [USE_FONT_BACKEND]: Handle
 855         FontBackend frame parameter.
 856
 857 2006-07-26  Kenichi Handa  <handa@m17n.org>
 858
 859         * font.h (struct font_driver_list): New member `on'.
 860         (Fclear_font_cache): EXFUN it.
 861         (font_update_drivers): Extern it.
 862
 863         * font.c (font_unparse_fcname): Fix typo (swidth->width).
 864         (font_list_entities): Check driver_list->on.
 865         (register_font_driver): Initalize `on' member to 0.
 866         (font_update_drivers): New function.
 867         (Fclear_font_cache): Check driver_list->on.
 868
 869         * frame.h (Qfont_backend): Extern it.
 870         (x_set_font_backend): Extern it.
 871
 872         * frame.c (Qfont_backend): New variable.
 873         (frame_parms): New element for font-backend.
 874         (x_set_font_backend): New function.
 875
 876         * xfns.c (Fx_create_frame) [USE_FONT_BACKEND]: Handle
 877         FontBackend frame parameter.
 878         (x_frame_parm_handlers) [USE_FONT_BACKEND]: New element
 879         x_set_font_backend.
 880
 881         * xfont.c (xfont_list): Don't try listing by :name property if the
 882         name is not for XLFD.
 883
 884 2006-07-24  Kenichi Handa  <handa@m17n.org>
 885
 886         * font.h (LGLYPH_FROM, LGLYPH_TO, LGLYPH_SET_FROM)
 887         (LGLYPH_SET_TO): New macros.
 888         (LGLYPH_XOFF, LGLYPH_YOFF, LGLYPH_WADJUST): Check if adjustment
 889         element of G is vector or not.
 890         (font_at): Extern it.
 891
 892         * font.c: Include window.h.
 893         (font_lispy_object): New function.
 894         (font_prepare_composition): Check LGLYPH_FORM (g) to detect the
 895         end of valid glyph.
 896         (font_close_object): Fix getting (struct font *).
 897         (font_at): New function.
 898         (Ffont_get): If FONT is a font-object, get entity from it.
 899         (Ffont_make_gstring): Initialize elements of glyphs with nil.
 900         (Ffont_fill_gstring): Use macro LGSTRING_XXX and LGLYPH_XXX.  Fix
 901         range check.
 902         (Ffont_at): New function.
 903         (syms_of_font): Defsubr Sfont_at.
 904
 905         * xdisp.c (it_props): Move the entry for Qauto_composed to just
 906         before the entry for Qcompostion.
 907         (handle_auto_composed_prop): Call auto-composition-function with 4
 908         args.
 909         (handle_composition_prop) [USE_FONT_BACKEND]: Set it->face_id from
 910         the font in gstring.
 911         (fill_composite_glyph_string) [USE_FONT_BACKEND]: Check
 912         LGLYPH_FORM (g) to detect the end of valid glyph.
 913         (x_produce_glyphs) [USE_FONT_BACKEND]: Don't update it->face_id if
 914         we are composing with gstring.
 915
 916         * xterm.c (x_draw_composite_glyph_string_foreground) [USE_FONT_BACKEND]:
 917         Check if adjustment is vector or not.
 918
 919         * Makefile.in (font.o): Make it depends on window.h.
 920
 921 2006-07-24  Kenichi Handa  <handa@m17n.org>
 922
 923         * xterm.c (x_draw_composite_glyph_string_foreground): Check if
 924         adjustment is vector or not.
 925
 926 2006-07-20  Kenichi Handa  <handa@m17n.org>
 927
 928         * casefiddle.c (casify_object): Sync with HEAD.
 929
 930 2006-07-18  Miles Bader  <miles@gnu.org>
 931
 932         * character.h (CHECK_CHARACTER): Redefine in terms of CHECK_TYPE.
 933
 934 2006-07-14  Kenichi Handa  <handa@m17n.org>
 935
 936         * font.h (LGLYPH_XOFF, LGLYPH_YOFF, LGLYPH_WIDTH, LGLYPH_WADJUST)
 937         (LGLYPH_SET_WIDTH): Adjusted for the change of LGLYPH format.
 938         (LGLYPH_ADJUSTMENT, LGLYPH_SET_ADJUSTMENT): New macros.
 939
 940         * font.c (font_merge_old_spec): Treat '*' in foundry as a wild
 941         card.
 942         (DEVICE_DELTA): Fix typo.
 943         (font_otf_gpos): Adjusted for the change of LGLYPH format.
 944         (font_prepare_composition): Likewise.
 945
 946         * xterm.c (x_draw_composite_glyph_string_foreground): Adjusted for
 947         the change of LGLYPH format.
 948
 949 2006-07-07  Kenichi Handa  <handa@m17n.org>
 950
 951         * ftfont.c (ftfont_list): Fix typo.
 952         (ftfont_build_basic_charsets): Don't include letters with
 953         diactrics.
 954
 955 2006-07-09  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 956
 957         * xfaces.c (realize_non_ascii_face): Set face->extra to NULL.
 958
 959         * xftfont.c (xftfont_done_face): Call XftDrawDestroy only if
 960         xftface_info is non-NULL.
 961
 962 2006-07-07  Kenichi Handa  <handa@m17n.org>
 963
 964         * ftfont.c (ftfont_list): Fix typo.
 965         (ftfont_build_basic_charsets): Don't include letters with
 966         diactrics.
 967
 968 2006-07-05  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 969
 970         * ftfont.c (ftfont_list): Move misplaced #endif
 971
 972 2006-07-05  Kenichi Handa  <handa@m17n.org>
 973
 974         * ftfont.c (ftfont_list): Pay attention to the case that
 975         FC_CAPABILITY is not defined.
 976
 977 2006-07-03  Kenichi Handa  <handa@m17n.org>
 978
 979         * xftfont.c (xftfont_open): Set charset related members to -1.
 980
 981         * ftfont.c (ftfont_list): Handle QCotf property.  Handling of
 982         QCname fixed.
 983         (ftfont_open): Set charset related members to -1.
 984
 985         * fontset.c (Votf_script_alist): New variable.
 986         (syms_of_fontset): Initialize it.
 987         (fontset_font): Delete unused variable.
 988
 989         * fontset.h (Votf_script_alist): Extern it.
 990
 991         * font.c (font_find_for_lface): Code optimized.
 992
 993         * font.h (font_close_object, font_merge_old_spec): Extern them.
 994
 995 2006-06-28  Kenichi Handa  <handa@m17n.org>
 996
 997         * font.c (QCscalable, Qc, Qm, Qp, Qd): New variables.
 998         (syms_of_font): Initialize them.
 999         (font_pixel_size): Allow float value in dpi.
1000         (font_prop_validate_type): Deleted.
1001         (font_prop_validate_symbol, font_prop_validate_style): Argument
1002         changed.  Caller changed.
1003         (font_prop_validate_non_neg): Renamed from
1004         font_prop_validate_size.
1005         (font_prop_validate_extra): Deleted.
1006         (font_prop_validate_spacing): New function.
1007         (font_property_table): Add elements for all known properties.
1008         (get_font_prop_index): Renamed from check_font_prop_name.  New
1009         argument FROM.  Caller changed.
1010         (font_prop_validate): Validate all known properties.
1011         (font_put_extra): Argument force deleted.  Caller changed.
1012         (font_expand_wildcards): Make it static.  Fix the way of shrinking
1013         the possible range.
1014         (font_parse_xlfd): Arguemnt merge deleted.  Fix handling of RESX,
1015         RESY, SPACING, and AVGWIDTH.  Don't validate property values here.
1016         Caller changed.
1017         (font_unparse_xlfd): Handle dpi, spacing, and scalable properties.
1018         (font_parse_fcname): Arguemnt merge deleted.  Fix parsing of point
1019         size.  Don't validate properties values here.  Caller changed.
1020         (font_unparse_fcname): Handle dpi, spacing, and scalable
1021         properties.
1022         (font_open_by_name): Delete unused variable.
1023         (Ffont_spec): Likewise.  Validate property values.
1024         (Ffont_match_p): New function.
1025
1026         * font.h (QCscalable): Extern it.
1027         (font_parse_xlfd, font_parse_fcname): Prototype adjusted.
1028
1029         * ftfont.c (ftfont_list): Handle properties dpi, spacing, and
1030         scalable.
1031
1032         * xfont.c (xfont_query_font): Adjusted for the change of
1033         font_parse_xlfd.
1034         (xfont_list_pattern): New function.
1035         (xfont_list): Use xfont_list_pattern.
1036
1037         * xftfont.c (xftfont_prepare_face): Cancel previous change.
1038         (xftfont_done_face): Likewise.
1039
1040 2006-06-26  Kenichi Handa  <handa@m17n.org>
1041
1042         * font.h (Flist_fonts): EXFUN it.
1043
1044 2006-06-25  Jason Rumney  <jasonr@gnu.org>
1045
1046         * w32term.c (w32_initialize): Add back smoothing_type and
1047         smoothing_enabled definitions.
1048
1049 2006-06-23  Kenichi Handa  <handa@m17n.org>
1050
1051         * xterm.c (x_draw_glyph_string) [USE_FONT_BACKEND]: Check
1052         s->face->font on determining underline position.
1053
1054 2006-06-21  Kenichi Handa  <handa@m17n.org>
1055
1056         * font.c (font_parse_xlfd): Fix generating of CHARSET_REGISTRY field.
1057         (font_has_char): Accept font-object too.
1058         (font_find_for_lface): Try at first with a size specified in face.
1059
1060         * xftfont.c (xftfont_prepare_face): Make non-ascii face share
1061         face->extra with ascii face.
1062         (xftfont_done_face): Don't free face->extra of non-ascii face.
1063
1064 2006-06-20  Kenichi Handa  <handa@m17n.org>
1065
1066         * frame.c (x_set_font) [USE_FONT_BACKEND]: Fix argument to
1067         font_open_by_name.
1068
1069 2006-06-19  Kenichi Handa  <handa@m17n.org>
1070
1071         * font.h (QCspacing, QCdpi): Extern them.
1072         (enum font_spacing): New enum.
1073         (FONT_PIXEL_SIZE_QUANTUM): New macro.
1074
1075         * font.c (POINT_TO_PIXEL): Don't divice POINT by 10.
1076         (QCspacing, QCdpi): New variables.
1077         (syms_of_font): Initialize them.
1078         (font_pixel_size): New function.
1079         (font_put_extra): New function.
1080         (font_parse_xlfd): Fix handling of font size.  Add QCdpi property
1081         in FONT_EXTRA.
1082         (font_parse_fcname): Handle enumenrated values (e.g. bold).  Fix
1083         handling font size.  Add QCname property that contains only
1084         unknown properties.
1085         (font_score): Change argument.  Caller changed.  Pay attention to
1086         FONT_PIXEL_SIZE_QUANTUM.
1087         (font_sort_entites): Fix handling of font size.
1088         (font_list_entities): Likewise.
1089         (font_find_for_lface): Likewise.
1090         (font_open_for_lface): Likewise.
1091         (font_open_by_name): Likewise.
1092         (Ffont_spec): Add QCname property that contains only unknown
1093         properties.
1094
1095         * ftfont.c (ftfont_list): Use assq_no_quit, not Fassq.  Don't
1096         include weight in listing pattern, instead check weight of each
1097         listed font.  Don't include scalable in pattern.  Pay attention to
1098         FONT_PIXEL_SIZE_QUANTUM.
1099
1100 2006-06-19  Kenichi Handa  <handa@m17n.org>
1101
1102         * lread.c (read_escape): Fix the code synched with HEAD.
1103
1104         * font.c (font_parse_fcname): Fix parsing of point-size.
1105         (font_unparse_fcname): Produce symbolic names for style
1106         properties.
1107         (font_list_entities): Handle float size correctly.
1108         (font_open_by_name): Prefer `normal' property values if the name
1109         doesn't specify them.
1110
1111         * fontset.c (Finternal_char_font): Use font_get_name, not
1112         Ffont_xlfd_name.
1113
1114         * ftfont.c (ftfont_pattern_entity): Use the numeric value 100 for
1115         FC_WEIGHT_REGULAR.  Exclude FC_SIZE and FC_PIXEL_SIZE from listing
1116         pattern.  Don't force scalable.
1117
1118         * xftfont.c (xftfont_open): For generating a name, start from
1119         96-byte buffer.
1120
1121 2006-06-16  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
1122
1123         * frame.h (x_new_fontset2): Fix prototype.
1124
1125 2006-06-16  Kenichi Handa  <handa@m17n.org>
1126
1127         * font.h (struct font_driver): Member parse_name deleted.
1128         (font_match_p, font_get_spec, font_parse_fcname)
1129         (font_unparse_fcname): Extern them.
1130         (font_get_name): Prototype adjusted.
1131
1132         * font.c (XLFD_SMALLNUM_MASK): Delete this macro.
1133         (XLFD_LARGENUM_MASK): Delete XLFD_ENCODING_MASK from it.
1134         (font_expand_wildcards): Fix handling ENCODING field.  Avoid
1135         unnecessary checks for weight, slant, and swidth.
1136         (font_parse_fcname): New function.
1137         (font_unparse_fcname): New function.
1138         (font_parse_name): New function.
1139         (font_match_p): New function.
1140         (font_get_name): Return value changed to Lisp string.
1141         (font_get_spec): New function.
1142         (Qunspecified, Qignore_defface): Don't extern them.
1143         (font_find_for_lface): Assume that LFACE is fully specified.
1144         (font_load_for_face): If lface[LFACE_FONT_INDEX] is an font
1145         object, use it for FACE.
1146         (font_open_by_name): Call Ffont_spec with QCname prop.  Don't call
1147         driver->parse_name.
1148         (Ffont_spec): Call font_parse_name, not font_parse_xlfd.
1149
1150         * fontset.h (new_fontset_from_font) [USE_FONT_BACKEND]: Prototype
1151         adjusted.
1152
1153         * fontset.c (new_fontset_from_font) [USE_FONT_BACKEND]: Argument F
1154         deleted.  Don't call Fnew_fontset.  Instead, directly call
1155         make_fontset.
1156
1157         * frame.h (x_new_fontset2) [USE_FONT_BACKEND]: Prototype adjusted.
1158
1159         * frame.c (x_set_font) [USE_FONT_BACKEND]: Adjusted for the change
1160         of x_new_fontset2.
1161
1162         * ftfont.c (Qmonospace, Qsans_serif, Qserif, Qmono, Qsans)
1163         (Qsans__serif): New variables.
1164         (ftfont_generic_family_list): New variable.
1165         (syms_of_ftfont): Initialize the above variables.
1166         (ftfont_pattern_entity): Argument NAME deleted.
1167         (ftfont_list_generic_family): New function.
1168         (ftfont_parse_name): Delete this function.
1169         (ftfont_list): Try generic family only when FcFontList found no
1170         font.
1171         (ftfont_list_family): Fix args to FcObjectSetBuild.
1172
1173         * xfaces.c (check_lface_attrs) [USE_FONT_BACKEND]: Accept font
1174         object in attrs[LFACE_FONT_INDEX].
1175         (set_lface_from_font_name): Cancel all changes for font-backend.
1176         (set_lface_from_font_and_fontset) [USE_FONT_BACKEND]: New
1177         function.
1178         (Finternal_set_lisp_face_attribute) [USE_FONT_BACKEND]: Accept a
1179         font object in QCfont attribute.
1180         (set_font_frame_param) [USE_FONT_BACKEND]: Likewise.
1181         (realize_default_face) [USE_FONT_BACKEND]: Call
1182         set_lface_from_font_and_fontset.
1183
1184         * xfns.c (x_default_font_parameter) [USE_FONT_BACKEND]: Try also
1185         "fixed", and signal error here if no suitable font was found.
1186
1187         * xfont.c (xfont_parse_name): Delete this function.
1188
1189         * xftfont.c (xftfont_open): Change coding style of error
1190         handling.  Generate fontconfig's fontname pattern.
1191
1192         * xterm.h (struct x_output) [USE_FONT_BACKEND]: New member fontp.
1193         (FRAME_FONT_OBJECT) [USE_FONT_BACKEND]: New macro.
1194
1195         * xterm.c (x_new_fontset2) [USE_FONT_BACKEND]: Change arguments.
1196         Both args FONTSET and FONT_OBJECT must be existing ones.
1197
1198 2006-06-16  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
1199
1200         * macterm.c (mac_set_unicode_keystroke_event): Don't use MAKE_CHAR.
1201
1202 2006-06-14  Kenichi Handa  <handa@m17n.org>
1203
1204         * xfont.c (xfont_open, xfont_encode_char): Fix typo.
1205
1206         * font.h (struct font): Fix typo.
1207
1208         * font.c (enum xlfd_field_index): Rename XLFD_XXX_SIZE_INDEX to
1209         XLFD_XXX_INDEX.
1210         (enum xlfd_field_mask): New enum.
1211         (intern_font_field): Argument changed.  Caller changed.  If digits
1212         are followed by non-digits, return a symbol.
1213         (font_expand_wildcards): New function.
1214         (font_parse_xlfd): Fix wildcard handling.
1215         (Ffont_spec): If :name is specified, reflect the info in the other
1216         properties.
1217
1218         * ftfont.c (ftfont_pattern_entity): Fix typo.
1219         (ftfont_list): Enforce FC_LANG in PATTERN to cancel the effect of
1220         locale.
1221
1222 2006-06-09  Kenichi Handa  <handa@m17n.org>
1223
1224         * font.h (Qiso8859_1, Qiso10646_1, Qunicode_bmp): Extern them.
1225
1226         * font.c (Qiso8859_1, Qiso10646_1, Qunicode_bmp): Moved from
1227         ftfont.c.
1228         (font_unparse_xlfd): Fix argument type declaration.  Append "*" if
1229         registry doesn't specify encoding part.
1230         (font_find_for_lface): Pay attention to LFACE_FONT_INDEX.
1231         (font_open_by_name): At first try parsing the name.
1232         (syms_of_font): Declare Qiso8859_1, Qiso10646_1, and Qunicode_bmp
1233         as Lisp symbols.
1234
1235         * fontset.c (reorder_font_vector): Pay attention to the case that
1236         the 3rd element of font_def is nil.
1237         (fontset_font): For the default fontset, append one more fontset
1238         elements for a script-based font specification.  Don't add script
1239         attribute on finding a font.
1240         (new_fontset_from_font): Unconditionally set FONTSET_ASCII to the
1241         font name.
1242         (fontset_ascii_font): If a font can't be opened, return nil.
1243
1244         * ftfont.c (Qiso8859_1, Qiso10646_1, Qunicode_bmp): Moved to
1245         font.c.
1246         (ftfont_pattern_entity): New function.
1247         (ftfont_get_cache): Assume that freetype_font_cache is already
1248         initialized.
1249         (ftfont_list): Handle the case that a file is specified in font
1250         name.  Use ftfont_pattern_entity to generate entities.
1251         (ftfont_has_char): Check if the pattern contains FC_CHARSET.
1252         (syms_of_ftfont): Initialize freetype_font_cache.
1253
1254         * xftfont.c (xftfont_open): Make the font name fontconfig's
1255         style.  Add BLOCK_INPUT and UNBLOCK_INPUT.
1256         (xftfont_close): Free font->font.name if not NULL.
1257
1258         * xfont.c (xfont_list): If script is specified for a font, return
1259         null_vector.
1260         (xfont_list_family): Declare argument type.
1261
1262         * xfaces.c (set_lface_from_font_name): If a font doesn't have a
1263         name, set LFACE_FONT (lface) to nil.
1264
1265         * xterm.c (x_new_fontset2): If an ASCII font couldn't be loaded,
1266         return Qnil.
1267
1268 2006-06-08  Jason Rumney  <jasonr@gnu.org>
1269
1270         * w32term.c (w32_initialize): Manually sync 2006-06-05 change from
1271         HEAD.
1272
1273 2006-06-08  Kenichi Handa  <handa@m17n.org>
1274
1275         * emacs.c (main): Check -enable-font-backend arg after the check
1276         of -nl.
1277         (standard_args): Add "-enable-font-backend".
1278
1279         * coding.c (Ffind_operation_coding_system): Sync with HEAD.
1280
1281         * callproc.c (Fcall_process): Sync with HEAD.
1282
1283         * coding.h (CODING_REQUIRE_ENCODING): Comment sync with HEAD.
1284
1285 2006-06-07  Kenichi Handa  <handa@m17n.org>
1286
1287         * xftfont.c (xftfont_default_fid): Set fid_known to 1.
1288         (struct xftdraw_list, xftdraw_list): Delete them.
1289         (register_xftdraw, check_xftdraw): Delete them.
1290         (xftfont_prepare_face): Don't call register_xftdraw.
1291         (xftfont_done_face): Don't call check_xftdraw.
1292         (xftfont_draw): Get backroudn color only when with_background is
1293         nonzero.
1294
1295         * xfont.c (xfont_encode_char): Fix calculation of char2b.
1296
1297 2006-06-06  Kenichi Handa  <handa@m17n.org>
1298
1299         These changes are for the new font handling codes.
1300
1301         * Makefile.in (ALL_CFLAGS): Add @FREETYPE_CFLAGS@,
1302         @FONTCONFIG_CFLAGS@, and @LIBOTF_CFLAGS@.
1303         (LIB_X11_LIB): If HAVE_XFT is defined, set to @XFT_LIBS@.
1304         (FONTSRC, FONTOBJ): New variables.
1305         (obj): Add $(FONTOBJ).
1306         (SOME_MACHINE_OBJECTS): Lib_X11_Lib.
1307         (LIBES): Add @FREETYPE_LIBS@, @FONTCONFIG_LIBS@, and
1308         @LIBOTF_LIBS@.
1309         (font.o, ftfont.o, xfont.o, xftfont.o, ftxfont.o): New targets.
1310         (fontset.o, xdisp.o, xfaces.o, xfns.o, xterm.o): Depends on
1311         $(FONTSRC).
1312
1313         * font.h, font.c, xfont.c, ftfont.c, xftfont.c, ftxfont.c: New
1314         files.
1315
1316         * character.h (Vscript_representative_chars): Extern it.
1317
1318         * character.c (Vscript_representative_chars): New variable.
1319         (syms_of_character): Declare it as a Lisp variable.
1320
1321         * composite.c (get_composition_id) [USE_FONT_BACKEND]: If
1322         enable_font_backend is nonzero, accept the composition method
1323         COMPOSITION_WITH_GLYPH_STRING.
1324
1325         * composite.h (enum composition_method) [USE_FONT_BACKEND]: New
1326         enumeration COMPOSITION_WITH_GLYPH_STRING.
1327
1328         * config.in: Re-generated.
1329
1330         * dispextern.h (struct glyph_string) [USE_FONT_BACKEND]: New
1331         members clip_x, clip_y, clip_width, and clip_height.
1332         (struct face) [USE_FONT_BACKEND]: New members font_info and extra.
1333
1334         * emacs.c (main) [USE_FONT_BACKEND]: Handle arg
1335         --enable-font-backend.  Call syms_of_font.
1336
1337         * fns.c (assoc_no_quit): New function.
1338
1339         * fontset.h (FONT_INFO_FROM_FACE): New macro.
1340         (face_for_font, new_fontset_from_font)
1341         (fontset_ascii_font) [USE_FONT_BACKEND]: Extern them.
1342
1343         * fontset.c [USE_FONT_BACKEND]: Include "font.h".
1344         (fontset_font, fontset_ascii, face_for_char)
1345         (make_fontset_for_ascii_face, Ffont_info)
1346         (Finternal_char_font) [USE_FONT_BACKEND]: If enable_font_backend
1347         is nonzero, use font-backend mechanism.
1348         (find_font_encoding): Make it non-static.
1349         (new_fontset_from_font, fontset_ascii_font) [USE_FONT_BACKEND]:
1350         New functions.
1351
1352         * frame.h (struct frame): New members resx and resy.
1353         (struct frame) [USE_FONT_BACKEND]: New member font_driver_list.
1354         (x_new_fontset2) [USE_FONT_BACKEND]: Extern it.
1355
1356         * frame.c [USE_FONT_BACKEND]: Include "font.h".
1357         (make_frame, x_set_font) [USE_FONT_BACKEND]: Use font-backend
1358         mechanism.
1359
1360         * lisp.h (assoc_no_quit): Extern it.
1361
1362         * xdisp.c: If USE_FONT_BACKEND is defined, include "font.h".
1363         Through out the file, use FONT_INFO_FROM_FACE instead of
1364         FONT_INFO_FROM_ID, use get_per_char_metric instead of
1365         rif->per_char_metric.
1366         (handle_composition_prop) [USE_FONT_BACKEND]: If the composition
1367         method is COMPOSITION_WITH_GLYPH_STRING, just set it->c to ' '.
1368         (get_glyph_face_and_encoding, fill_composite_glyph_string)
1369         (get_char_face_and_encoding, BUILD_COMPOSITE_GLYPH_STRING)
1370         (x_produce_glyphs) [USE_FONT_BACKEND]: If enable_font_backend is
1371         nonzero, use font-backend mechanism.
1372         (get_per_char_metric): New function.
1373
1374         * xfaces.c [USE_FONT_BACKEND]: Include "font.h".
1375         (set_lface_from_font_name)
1376         (set_font_frame_param, free_realized_face)
1377         (prepare_face_for_display, clear_face_gcs)
1378         (Finternal_set_font_selection_order, realize_x_face)
1379         [USE_FONT_BACKEND]: If enable_font_backend is nonzero, use
1380         font-backend mechanism.
1381         (clear_face_cache) [USE_FONT_BACKEND]: Don't call
1382         clear_font_table.
1383         (load_face_font) [USE_FONT_BACKEND]: Abort.
1384         (face_symbolic_value, face_symbolic_weight, face_symbolic_slant)
1385         (face_symbolic_swidth, face_for_font) [USE_FONT_BACKEND]: New
1386         functions.
1387
1388         * xfns.c [USE_FONT_BACKEND]: Include "font.h".
1389         (x_default_font_parameter) [USE_FONT_BACKEND]: New function.
1390         (Fx_create_frame) [USE_FONT_BACKEND]: If enable_font_backend is
1391         nonzero, register all available font drivers.  Call
1392         x_default_font_parameter for deciding a font.
1393         (x_create_tip_frame) [USE_FONT_BACKEND]: Likewise.
1394
1395         * xterm.c [USE_FONT_BACKEND]: Include "font.h".
1396         (x_set_mouse_face_gc, x_set_glyph_string_clipping)
1397         (x_set_glyph_string_clipping_exactly)
1398         (x_compute_glyph_string_overhangs)
1399         (x_draw_glyph_string_foreground)
1400         (x_draw_composite_glyph_string_foreground, x_draw_glyph_string)
1401         (x_free_frame_resources) [USE_FONT_BACKEND]: If
1402         enable_font_backend is nonzero, use font-backend mechanism.
1403         (x_new_fontset2) [USE_FONT_BACKEND]: New function.
1404
1405 2006-05-15  Kenichi Handa  <handa@m17n.org>
1406
1407         * coding.h (system_eol_type): Fix synching with HEAD.
1408
1409         * coding.c (system_eol_type): Sync with HEAD.
1410         (coding_inherit_eol_type): If PARENT is nil, inherit from
1411         system_eol_type.
1412         (syms_of_coding): Initialize system_eol_type.
1413
1414         * callproc.c (Fcall_process): Sync with HEAD.
1415
1416         * process.c (setup_process_coding_systems): Fix synching with
1417         HEAD.
1418         (read_process_output): Likewise.
1419         (Fset_process_coding_system): Inherit system's eol format if
1420         necessary.
1421
1422         * fileio.c (choose_write_coding_system): Fix synching with HEAD.
1423
1424         * keymap.c (push_key_description): Fix synching with HEAD.
1425
1426 2006-05-02  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
1427
1428         * macgui.h (USE_ATSUI): Don't enable on emacs-unicode-2 branch.
1429
1430 2006-04-07  Kenichi Handa  <handa@m17n.org>
1431
1432         * coding.c (decode_eol): Pay attention to buffer relocation in
1433         del_range_2.
1434         (decode_coding): Call decode_eol before restoring undo_list.
1435
1436 2006-03-20  Kenichi Handa  <handa@m17n.org>
1437
1438         * charset.c (Fdefine_charset_internal): Fix setting of
1439         emacs_mule_bytes.
1440
1441 2006-03-14  Kenichi Handa  <handa@m17n.org>
1442
1443         * keyboard.c (read_char): Check if C is a character or not before
1444         looking up Vkeyboard_translate_table.
1445
1446 2006-03-10  Kenichi Handa  <handa@m17n.org>
1447
1448         * coding.c (DECODE_EMACS_MULE_20_RELATIVE_COMPOSITION): Fix
1449         condition to terminate the loop.
1450
1451 2006-03-09  Kenichi Handa  <handa@m17n.org>
1452
1453         * coding.c (produce_composition): Compare charbuf[i] instead of
1454         args[i] against 0.
1455         (Fterminal_coding_system): Use EQ to compare Lisp objects.
1456
1457 2006-03-07  Kenichi Handa  <handa@m17n.org>
1458
1459         * coding.c (DECODE_COMPOSITION_START): If the source is short, set
1460         coding->result to CODING_RESULT_INSUFFICIENT_SRC.
1461         (decode_coding_gap): Set CODING_MODE_LAST_BLOCK after the call of
1462         detect_coding.
1463         (emacs_mule_char): Handle old style (Emacs 20) component character
1464         of a composition.
1465         (DECODE_EMACS_MULE_COMPOSITION_RULE_20): Fix parsing a composition
1466         rule.
1467         (DECODE_EMACS_MULE_20_RULEBASE_COMPOSITION): Likewise.
1468         (decode_coding_emacs_mule): Handle invalid bytes correctly.
1469
1470 2006-03-04  Kenichi Handa  <handa@m17n.org>
1471
1472         * coding.c (encode_coding_ccl): Allocate destination dynamically
1473         when necessary.
1474
1475 2006-03-03  Kenichi Handa  <handa@m17n.org>
1476
1477         * ccl.c (Fccl_execute_on_string): Fix the condition of terminating
1478         the loop.  When quitted, show a proper error message.
1479
1480 2006-03-02  Kenichi Handa  <handa@m17n.org>
1481
1482         * coding.c (decode_coding): Fix previous change.
1483
1484         * xterm.c (x_set_glyph_string_clipping_exactly): Set
1485         src->clip_head and src->clip_tail temporarily instead of src->hl.
1486
1487         * ccl.c (CCL_WRITE_STRING): Handle a flag bit for multibyte
1488         character sequence.
1489         (Fccl_execute_on_string): Use ASET, not XSET.
1490
1491 2006-03-01  Kenichi Handa  <handa@m17n.org>
1492
1493         * search.c (search_buffer): Fix handling of "\\" in a trivial
1494         regexp.
1495
1496 2006-02-28  Kenichi Handa  <handa@m17n.org>
1497
1498         * coding.c (decode_coding): Fix the condition of terminating the
1499         decoding loop.
1500
1501 2006-02-27  Kenichi Handa  <handa@m17n.org>
1502
1503         * data.c (Faset): On setting a character bigger than 255 in a
1504         unibyte string, signal an error instead of make the string
1505         multibyte.
1506
1507 2006-02-22  Kenichi Handa  <handa@m17n.org>
1508
1509         * charset.c (map_charset_chars): Fix for ascii-compatible charset
1510         made by a mapping table.
1511
1512 2006-02-21  Kenichi Handa  <handa@m17n.org>
1513
1514         * xdisp.c (fill_composite_glyph_string): Check s->face is NULL or
1515         not.
1516         (BUILD_COMPOSITE_GLYPH_STRING): If C is TAB, set s->face to NULL.
1517         (x_produce_glyphs): If CH is TAB, set cmp->offsets properly.
1518
1519         * xterm.c (x_draw_composite_glyph_string_foreground): Check
1520         s->face is NULL or not.
1521
1522 2006-02-20  Kenichi Handa  <handa@m17n.org>
1523
1524         * xterm.c (x_set_glyph_string_clipping_exactly): New function.
1525         (x_draw_glyph_string): Fix drawing of right_overhang and
1526         left_overhang around/on cursor.
1527
1528         * xdisp.c (draw_glyphs): Fix inclusion of right_overwriting
1529         glyphs.
1530
1531         * term.c (produce_glyphs): Sync to HEAD.
1532
1533 2006-02-15  Kenichi Handa  <handa@m17n.org>
1534
1535         * xdisp.c (x_produce_glyphs): Handle composition with TAB.
1536
1537 2006-02-05  Kenichi Handa  <handa@m17n.org>
1538
1539         * coding.c: Cancel incorrect synching with HEAD.
1540
1541 2006-02-03  Kenichi Handa  <handa@m17n.org>
1542
1543         * coding.c (Fdefine_coding_system_internal): Avoid a duplicated
1544         element in Vcoding_system_alist.
1545         (Fdefine_coding_system_alias): Likewise.
1546
1547 2006-01-19  Kenichi Handa  <handa@m17n.org>
1548
1549         * xterm.c (handle_one_xevent): Handle keysyms 0x1000000..0x10000FF.
1550
1551         * coding.c: Sync to HEAD for handling autoload-coding-system.
1552         (Qcoding_system_define_form): New variable.
1553         (syms_of_coding): Intern and staticpro it.
1554         (Fcoding_system_p): Check Qcoding_system_define_form.
1555         (Fcheck_coding_system): Try to autoload the definition of
1556         CODING-SYSTEM.
1557
1558         * coding.h (CODING_SYSTEM_P): If ID is not available, call
1559         Fcoding_system_p.
1560         (CHECK_CODING_SYSTEM): If ID is not available, call
1561         Fcheck_coding_system.
1562         (CHECK_CODING_SYSTEM_GET_SPEC): Try also Fcheck_coding_system.
1563         (CHECK_CODING_SYSTEM_GET_ID): Likewise.
1564
1565 2006-01-17  Kenichi Handa  <handa@m17n.org>
1566
1567         * xterm.c (handle_one_xevent): Delete unnecessary code inserted by
1568         sync with HEAD.
1569
1570         * coding.c (code_conversion_restore): GCPRO arg.
1571
1572 2005-12-28  Kenichi Handa  <handa@m17n.org>
1573
1574         * character.c (lisp_string_width): Check multibyteness of STRING.
1575
1576 2005-10-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
1577
1578         * macterm.c (mac_encode_char): Call ccl_driver with the last arg
1579         Qnil.  Use JIS_TO_SJIS instead of ENCODE_SJIS.
1580         (decode_mac_font_name): Use decode_coding_c_string instead of
1581         decode_coding.
1582         (x_load_font): Initialize fontp->fontset to -1.  Set
1583         fontp->encoding_type.
1584
1585 2005-10-17  Kenichi Handa  <handa@m17n.org>
1586
1587         * search.c (search_buffer): Give up BM search on case-fold-search
1588         if one of a target character has a case-equivalence of different
1589         byte length even if that target charcter is an ASCII.
1590         (simple_search): Fix culculation of byte length of matched text.
1591         (boyer_moore): Fix handling of case-equivalent multibyte
1592         characters.
1593
1594 2005-10-15  Kenichi Handa  <handa@m17n.org>
1595
1596         * coding.c (decode_coding): Fix handling of invalid bytes.
1597
1598 2005-10-06  Kenichi Handa  <handa@m17n.org>
1599
1600         * xterm.c (handle_one_xevent): Handle keysyms directly mapped to
1601         Unicode characters.
1602
1603 2005-09-23  Kenichi Handa  <handa@m17n.org>
1604
1605         * coding.c (encode_coding_object): If a pre-write-conversion
1606         function makes a new buffer, kill it.
1607
1608 2005-07-29  Kenichi Handa  <handa@m17n.org>
1609
1610         * coding.c (QCascii_compatible_p): New variable.
1611         (syms_of_coding): Initialize it.
1612         (ONE_MORE_BYTE): Decrement `src' before calling string_char.
1613         (ONE_MORE_BYTE_NO_CHECK): Likewise.
1614         (record_conversion_result): Add `default:' case.
1615         (coding_charset_list): Delete unused variable `coding_type'.
1616         (Fdefine_coding_system_internal): Add `ascii-compatible-p'
1617         property in the plist of the coding system.
1618         (Fcoding_system_put): Check QCascii_compatible_p.
1619
1620 2005-06-09  Kenichi Handa  <handa@m17n.org>
1621
1622         * xdisp.c (get_next_display_element): Sync with the change in
1623         HEAD (2005-06-08).
1624
1625 2005-06-06  Kenichi Handa  <handa@m17n.org>
1626
1627         * callproc.c (Fcall_process): Sync with the change in
1628         HEAD (2005-06-04).
1629
1630 2005-06-05  Miles Bader  <miles@gnu.org>
1631
1632         * xfaces.c (Finternal_lisp_face_equal_p): Restore previously
1633         removed calculation of frame `f', as it's now used.
1634
1635 2005-05-22  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
1636
1637         * macterm.c (x_font_name_to_mac_font_name): Sync with trunk
1638         for the case that does not require code conversion.
1639
1640 2005-05-11  Kenichi Handa  <handa@m17n.org>
1641
1642         * Makefile.in (shortlisp): Cancel previous change.
1643         (RUN_TEMACS): Include "-nl" if HAVE_SHM is defined.
1644         (emacs${EXEEXT}): Run $(RUN_TEMACS) unconditionally.
1645         (UNIDATA): New variable.
1646         (${lispsource}international/charprop.el): Depends on ${UNIDATA}.
1647         (bootstrap-emacs${EXEEXT}): Depends on charprop.el.  Run
1648         $(RUN_TEMACS) unconditionally.
1649
1650 2005-05-10  Kenichi Handa  <handa@m17n.org>
1651
1652         * Makefile.in (shortlisp): Add ../lisp/international/charprop.el.
1653         (temacs${EXEEXT}): Build charprop.el if necessary.
1654         (admindir): New variable.
1655         ($(lispsource)international/charprop.el): New target.
1656
1657 2005-05-04  Miles Bader  <miles@gnu.org>
1658
1659         * character.c (chars-in-region): Obsolete function removed.
1660         (syms_of_character): Remove its initialization.
1661
1662 2005-04-28  Benjamin Riefenstahl  <b.riefenstahl@turtle-trading.net>
1663
1664         * w32select.c (validate_coding_system)
1665         (setup_windows_coding_system): New functions.
1666         (convert_to_handle_as_coded, Fw32_get_clipboard_data): Use
1667         setup_windows_coding_system.
1668         (setup_config, Fw32_get_clipboard_data): Use
1669         validate_coding_system.
1670         (Fx_selection_exists): Move call to setup_config to a place
1671         were signals are allowed.
1672
1673         * lisp.h (Fcoding_system_base, Fcoding_system_eol_type)
1674         (Fcheck_coding_system): Add declarations.
1675
1676 2005-04-28  Kenichi Handa  <handa@m17n.org>
1677
1678         * s/ms-w32.h (STDC_HEADERS): Sync with the change in
1679         HEAD (2005-04-23).
1680
1681 2005-04-25  Kenichi Handa  <handa@m17n.org>
1682
1683         * charset.c (load_charset_map_from_vector): Fix for the first
1684         iteration.
1685
1686 2005-04-22  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
1687
1688         * macfns.c (Fx_create_frame, x_create_tip_frame): Pass Lisp
1689         string as the second argument for x_new_fontset.
1690
1691 2005-04-18  Kenichi Handa  <handa@m17n.org>
1692
1693         * fns.c (Fstring_as_multibyte): Fix the change for syncing with
1694         CVS head.
1695
1696 2005-04-09  Kenichi Handa  <handa@m17n.org>
1697
1698         * search.c (search_buffer): Fix the change for syncing with CVS
1699         head.
1700         (search_buffer): Likewise.
1701
1702 2005-03-31  Kenichi Handa  <handa@m17n.org>
1703
1704         * xdisp.c (get_next_display_element): Sync with CVS head.
1705
1706 2005-03-29  Kenichi Handa  <handa@m17n.org>
1707
1708         * coding.c (decode_coding_object): Use safe_call1 instead of call1.
1709         (encode_coding_object): Use safe_call instead of call2.
1710
1711 2005-03-14  Kenichi Handa  <handa@m17n.org>
1712
1713         * fontset.c (set_default_ascii_font): Fix the change for
1714         syncing with CVS head.
1715
1716 2005-01-30  Kenichi Handa  <handa@m17n.org>
1717
1718         * fontset.c (Fset_fontset_font): Check family element of a given
1719         vector.
1720
1721         * Makefile.in (lisp): Include charprop.el.
1722
1723 2005-01-17  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
1724
1725         * macfns.c (Fx_create_frame, x_create_tip_frame): Fix crash.
1726         Not sure if it's unnecessary.
1727
1728 2005-01-16  Steven Tamm  <steventamm@mac.com>
1729
1730         * macfns.c (Fx_create_frame, x_create_tip_frame): ifdef'd out
1731         some possibly unnecessary fontset checking code that crashed
1732         when creating a new frame
1733
1734 2005-01-17  Kenichi Handa  <handa@m17n.org>
1735
1736         * xfaces.c (merge_faces): Fix argument to lookup_derived_face and
1737         lookup_face.
1738
1739         * xdisp.c (Fformat_mode_line): Fix argument to lookup_named_face.
1740
1741         * fringe.c (draw_fringe_bitmap_1): Fix argument to
1742         lookup_named_face.
1743
1744 2004-12-25  Kenichi Handa  <handa@m17n.org>
1745
1746         * xdisp.c (get_next_display_element): Sync to the change in HEAD
1747         on 2004-12-21.
1748
1749 2004-12-11  Kenichi Handa  <handa@m17n.org>
1750
1751         * search.c: Sync to the change in HEAD on 2004-11-19, 20.
1752
1753         * w32console.c: Sync to the change in HEAD on 2004-12-01.
1754
1755         * coding.c: Cancel the change done in HEAD on 2004-11-30.
1756         (coding_charset_list): New function.
1757
1758         * coding.h (coding_charset_list): Extern it.
1759
1760         * term.c: Sync to the change in HEAD on 2004-11-30.
1761
1762 2004-12-09  Kenichi Handa  <handa@m17n.org>
1763
1764         * fontset.c (Fset_fontset_font): Call find_font_encoding with
1765         concatenation of family and registry.
1766
1767 2004-12-06  Kenichi Handa  <handa@m17n.org>
1768
1769         * character.h (BYTE8_STRING): Fix typo.
1770
1771         * editfns.c (Ftranslate_region_internal): Don't convert unibyte
1772         string to multibyte (sync to HEAD).
1773
1774         * casefiddle.c (casify_region): Handle changes in byte-length
1775         using replace_range_2 (sync to HEAD).
1776
1777 2004-11-24  Andreas Schwab  <schwab@suse.de>
1778
1779         * chartab.c (map_char_table): GCPRO table and arg.
1780
1781 2004-10-29  Kenichi Handa  <handa@m17n.org>
1782
1783         * syntax.c (skip_syntaxes): Return lispy 0 (not nil) if point is
1784         already at limit.
1785
1786 2004-10-23  Kenichi Handa  <handa@m17n.org>
1787
1788         * fontset.c (fs_load_font): Use fast_string_match_ignore_case
1789         instead of fast_c_string_match_ignore_case.
1790         (find_font_encoding): Argument changed to Lisp_Object.  Use
1791         fast_string_match_ignore_case instead of
1792         fast_c_string_match_ignore_case.  Caller changed.
1793
1794 2004-10-15  Kenichi Handa  <handa@m17n.org>
1795
1796         * xdisp.c (get_next_display_element): In unibyte case, decide to
1797         display in octal form by checking a chacter by
1798         UNIBYTE_CHAR_HAS_MULTIBYTE_P.
1799
1800         * charset.c (Fset_unibyte_charset): Setup
1801         unibyte_has_multibyte_table.
1802
1803         * character.c (unibyte_has_multibyte_table): New variable.
1804
1805         * character.h (unibyte_has_multibyte_table): Extern it.
1806         (UNIBYTE_CHAR_HAS_MULTIBYTE_P): New macro.
1807
1808 2004-10-14  Kenichi Handa  <handa@m17n.org>
1809
1810         * callproc.c (Fcall_process): Fix merging of 2004-10-13 change.
1811
1812 2004-10-13  Kenichi Handa  <handa@m17n.org>
1813
1814         * coding.c (encode_coding_iso_2022): Fix handling of charset
1815         annotation.
1816
1817 2004-10-12  Kenichi Handa  <handa@m17n.org>
1818
1819         * coding.c (setup_coding_system): If coding_system is nil, use
1820         Qundecided.
1821         (Fterminal_coding_system): Return nil if terminal coding system is
1822         `undecided'.
1823         (syms_of_coding): Define coding-system `undecided' here.  Setup
1824         terminal_coding as `undecided'.
1825
1826 2004-10-04  Kenichi Handa  <handa@m17n.org>
1827
1828         * xdisp.c (message_dolog, set_message_1): Call
1829         unibyte_char_to_multibyte with arg type int.
1830
1831         * fileio.c (Fsubstitute_in_file_name): Fix previous change.
1832
1833         * lread.c (read1): Fix reading of a char-table.
1834
1835         * print.c (print_object): Include sub char-table in cicularities
1836         detection.
1837
1838 2004-10-01  Kenichi Handa  <handa@m17n.org>
1839
1840         * keymap.c (where_is_internal_2): Fix for the case that KEY is a
1841         cons.  Append the found sequences in car of ARGS instead of
1842         prepending.
1843
1844 2004-09-28  Kenichi Handa  <handa@m17n.org>
1845
1846         * fileio.c (report_file_error): Make a unibyte string from
1847         strerror (errorno).
1848         (Fsubstitute_in_file_name): Fix the arg to
1849         unibyte_char_to_multibyte.  It is evaluated twice.
1850
1851 2004-09-19  Kenichi Handa  <handa@m17n.org>
1852
1853         * charset.h (CHAR_CHARSET): Shortcut for ASCII case.
1854
1855 2004-09-14  Kenichi Handa  <handa@m17n.org>
1856
1857         * coding.c (detect_coding): Fix previous change.
1858
1859 2004-09-13  Kenichi Handa  <handa@m17n.org>
1860
1861         * coding.c (detect_coding_utf_16): Don't set detect_info->found if
1862         BOM is not found.
1863         (detect_coding): Optimization for ISO-2022 when no 8-bit data is
1864         found.
1865         (detect_coding_system): Likewise.
1866
1867 2004-09-01  Jason Rumney  <jasonr@gnu.org>
1868
1869         * w32fns.c (x_to_w32_font): Update to use new coding struct.
1870
1871 2004-08-17  Kenichi Handa  <handa@m17n.org>
1872
1873         * charset.c (Fdeclare_equiv_charset): Fix handing of CHARS.
1874         (Fiso_charset): Likewise.
1875
1876 2004-08-03  Steven Tamm  <steventamm@mac.com>
1877
1878         * macterm.c (mac_encode_char): Add charset argument and update
1879         to use encoding_type
1880         (x_new_font,x_new_fontset): Merge in changes from xterm.c;
1881         switch to pure fontset
1882         (decode_mac_font_name): Temporarily remove decoding
1883         (x_font_name_to_mac_font_name): Temporarily remove encoding
1884         (x_load_font): Temporarily remove encoding
1885
1886 2004-06-30  Kenichi Handa  <handa@m17n.org>
1887
1888         * xfaces.c (Fface_font): If frame is not on a window system,
1889         ignore CHARACTER arg.  If HAVE_WINDOW_SYSTEM is not defined, don't
1890         refer to face->font.
1891         (split_font_name_into_vector, build_font_name_from_vector)
1892         (lookup_non_ascii_face, realize_non_ascii_face): Define them only
1893         whne HAVE_WINDOW_SYSTEM is defined.
1894
1895 2004-05-29  Kenichi Handa  <handa@m17n.org>
1896
1897         * xdisp.c (BUILD_GLYPH_STRINGS): Check if s is NULL.
1898         (x_produce_glyphs): Fix setting of members of cmp in case
1899         cmp->glyph_len is zero,
1900
1901         * fontset.c (Fset_fontset_font): Docstring fixed.
1902         (Ffontset_info): Make it backward compatible.  New arg ALL.
1903
1904 2004-05-11  Kim F. Storm  <storm@cua.dk>
1905
1906         * process.c (read_process_output): Grow decoding_buf when needed;
1907         this could cause a crash in allocate_string and compact_small_strings.
1908
1909 2004-04-29  Kenichi Handa  <handa@m17n.org>
1910
1911         * fileio.c (WRITE_BUF_SIZE): This macro deleted.
1912         (e_write): Fix previous change.
1913
1914 2004-04-28  Kenichi Handa  <handa@m17n.org>
1915
1916         * coding.c (setup_coding_system): Set coding->common_flags
1917         correctly for raw-text.
1918         (consume_chars): On encoding unibyte text by raw-text, don't check
1919         multibyte form.
1920         (encode_coding): On encoding by raw-text, never use translation
1921         tables.
1922
1923         * fileio.c (e_write): Short cut for the case of no encoding.
1924
1925 2004-04-20  Kenichi Handa  <handa@m17n.org>
1926
1927         * coding.c (detect_coding): Delete unused variables.
1928         (detect_coding_system): Likewise.
1929
1930 2004-04-18  Kenichi Handa  <handa@m17n.org>
1931
1932         * coding.c (encode_coding_utf_8): Fix handling of raw-byte char.
1933         (consume_chars): Fix handling of 8-bit bytes in unibyte source.
1934
1935 2004-04-14  Kenichi Handa  <handa@m17n.org>
1936
1937         Sync all files to HEAD.
1938
1939 2004-04-14  Kenichi Handa  <handa@m17n.org>
1940
1941         * coding.c (Ffind_coding_systems_region_internal): Include
1942         raw-text and no-conversion in the result.
1943
1944         * fontset.h: Sync to HEAD.
1945
1946         * fontset.c: Sync to HEAD.
1947
1948 2004-04-14  Kenichi Handa  <handa@m17n.org>
1949
1950         * fontset.c (find_font_encoding): Return `ascii' for unknown
1951         encoding.
1952         (load_font_get_repertory): Delete unnecessary check of ENCODING of
1953         FONT_DEF.
1954         (font_def_arg, add_arg, from_arg, to_arg): New args.
1955         (set_fontset_font): Argument changed.
1956         (Fset_fontset_font): Fix for the case that TARGET is a script
1957         name and charset name.
1958         (new_fontset_from_font_name): Fix argument to Fnew_fontset.
1959
1960 2004-04-13  Kenichi Handa  <handa@m17n.org>
1961
1962         * fontset.c (fontset_font): Renamed from fontset_face.  Return
1963         value changed.
1964         (face_suitable_for_char_p): Adjusted for the change of
1965         fontset_font.
1966         (face_for_char): Likewise.
1967         (make_fontset_for_ascii_face): Fix setting of the fontset element
1968         for ASCII.
1969         (Finternal_char_font): Use fontset_font instead of FACE_FOR_CHAR
1970         to get a font name.
1971         (Ffontset_info): Adjusted for the change of fontset_font.
1972
1973         * composite.c: Sync to HEAD.
1974
1975         * search.c: Sync to HEAD.
1976
1977         * coding.c: Sync to HEAD.
1978         (emacs_mule_char): Check invalid code more regidly.
1979
1980         * coding.h: Sync to HEAD.
1981
1982         * charset.c: Sync to HEAD.
1983
1984         * charset.h: Sync to HEAD.
1985
1986         * character.h (LEADING_CODE_LATIN_1_MIN)
1987         (LEADING_CODE_LATIN_1_MAX): Delete these macros.
1988
1989 2004-04-08  Kenichi Handa  <handa@m17n.org>
1990
1991         * category.h: Sync to HEAD.
1992
1993         * category.c: Sync to HEAD.
1994
1995         * syntax.h: Sync to HEAD.
1996
1997         * syntax.c: Sync to HEAD.
1998
1999         * regex.h: Sync to HEAD.
2000
2001         * regex.c: Sync to HEAD.
2002
2003 2004-04-07  Kenichi Handa  <handa@m17n.org>
2004
2005         * editfns.c: Sync to HEAD.
2006         (check_translation): New function.
2007         (Ftranslate_region_internal): Handle M:N mapping.
2008
2009 2004-04-06  Kenichi Handa  <handa@m17n.org>
2010
2011         * xfaces.c (xlfd_point_size): Set font->numeric[XLFD_PIXEL_SIZE].
2012
2013 2004-03-30  Kenichi Handa  <handa@m17n.org>
2014
2015         * coding.c (DECODE_DESIGNATION): Set chars_96 to -1 instead of
2016         goto invalid_code.
2017         (decode_coding_iso_2022): Fix handling of invalid designation.
2018
2019         * fileio.c (Finsert_file_contents): Be sure to call unbind_to
2020         after calling code_conversion_save.
2021
2022 2004-03-11  Kenichi Handa  <handa@m17n.org>
2023
2024         * xdisp.c (handle_auto_composed_prop): Fix Lisp_Object/int mixup.
2025
2026         * print.c (print_prune_string_charset): Fix Lisp_Object/int mixup.
2027
2028         * fontset.c: Include "intervals.h".
2029         (fontset_face): Fix comparing of Lisp_Objects.
2030         (free_face_fontset): Fix Lisp_Object/int mixup.
2031         (new_fontset_from_font_name): Likewise.
2032
2033         * editfns.c (Ftranslate_region_internal): Fix Lisp_Object/int mixup.
2034
2035         * coding.c: Add many prototypes for static functions.
2036         (get_translation_table): Allow max_lookup to be NULL.
2037         (decode_coding): Call get_translation_table with max_lookup NULL.
2038         (Ffind_coding_systems_region_internal): Likewise.
2039         (Funencodable_char_position, Fcheck_coding_systems_region):
2040         Likewise.
2041
2042 2004-03-11  Kenichi Handa  <handa@m17n.org>
2043
2044         * coding.c (get_translation_table): Declare it as Lisp_Object.
2045         (LOOKUP_TRANSLATION_TABLE): New macro.
2046         (produce_chars): Use LOOKUP_TRANSLATION_TABLE instead of
2047         CHAR_TABLE_REF.
2048         (consume_chars): Likewise.
2049
2050 2004-03-11  Kenichi Handa  <handa@m17n.org>
2051
2052         * coding.c (MAX_ANNOTATION_LENGTH): Adjusted for the change of
2053         annotation data format.
2054         (ADD_ANNOTATION_DATA, ADD_COMPOSITION_DATA, ADD_CHARSET_DATA):
2055         Change arguments FROM and TO to single argument NCHARS.  Caller
2056         changed.
2057         (decode_coding_utf_8): Pay attention to coding->charbuf_used.
2058         (decode_coding_utf_16, decode_coding_emacs_mule)
2059         (decode_coding_iso_2022, decode_coding_sjis, decode_coding_big5)
2060         (decode_coding_ccl, decode_coding_charset): Likewise.
2061         (get_translation): New function.
2062         (produce_chars): New arguments translation_table and last_block.
2063         Translate characters here.  Return number of carryover chars.
2064         Caller changed.
2065         (produce_composition): New argument pos.  Caller changed.
2066         Adjusted for the change of annotation data format.
2067         (produce_charset, produce_annotation): Likewise.
2068         (decode_coding, encode_coding): Don't call translate_chars.
2069         (consume_chars): New arg translation_table.  Caller changed.
2070         (translate_chars): Deleted.
2071         (syms_of_coding): Make translation-table's number of extra slots
2072         2.
2073
2074 2004-03-09  Kenichi Handa  <handa@m17n.org>
2075
2076         * search.c (simple_search): Fix setting this_pos_byte in backward
2077         search.
2078
2079         * coding.c (detect_coding_emacs_mule): Fix counting of encoded
2080         byte sequence.
2081         (detect_coding_ccl): Fix setting of the variable valids.
2082
2083 2004-03-04  Kenichi Handa  <handa@m17n.org>
2084
2085         * xterm.c (x_list_fonts): Fix the detection of an auto-scaled font.
2086
2087         * coding.c (decode_coding_utf_16): Fix handling of surrogate pair.
2088
2089         * editfns.c (Ftranslate_region_internal): Renamed from
2090         Ftranslate_region.  Accept a char-table in TABLE.
2091         (syms_of_editfns): Defsubr Stranslate_region_internal.
2092
2093         * xfaces.c (set_lface_from_font_name): If a font is specified for
2094         a frame, generate a fontset from the font.
2095         (build_scalable_font_name): If the scalable font is requested for
2096         a specific size, don't change that size.
2097         (try_font_list): Try a scalable font also in the case that a
2098         pattern string is specified,
2099
2100
2101 2004-03-03  Kenichi Handa  <handa@m17n.org>
2102
2103         * xfaces.c (Fface_font): New optional arg CHARACTER.
2104
2105 2004-02-17  Kenichi Handa  <handa@m17n.org>
2106
2107         * charset.h (CHARSET_OFFSET): New macro.
2108
2109 2004-02-13  Kenichi Handa  <handa@m17n.org>
2110
2111         * xterm.c (x_get_font_repertory): Fix for non-Unicode-bmp charset.
2112
2113         * fontset.c (fontset_face): Handle the case that repertory is a
2114         char-table.
2115         (find_font_encoding): Return nil for unknown encoding.
2116         (Fset_fontset_font): Ignore a font of unknown encoding.
2117
2118 2004-02-09  Kenichi Handa  <handa@m17n.org>
2119
2120         * keymap.c (describe_vector): Handle default value of a char
2121         table.
2122
2123         * fontset.c (fontset_face): Handle fallback fonts correctly.
2124         (Ffontset_info): Return infomation about fallback fonts.
2125
2126 2004-02-06  Kenichi Handa  <handa@m17n.org>
2127
2128         * fontset.c (FONTSET_DEFAULT): New macro.
2129         (FONTSET_ADD): Handle the case that range is nil.
2130         (fontset_add): Likewise.
2131         (Fset_fontset_font): Change the 2nd arg name to TARGET, and handle
2132         the case that it is nil.
2133         (dump_fontset): Call FONTSET_DEFAULT, not FONTSET_FALLBACK.
2134         (syms_of_fontset): Set char-table-extra-slots property of fontset
2135         to 9.
2136
2137         * charset.h (CHAR_CHARSET_P): Fix for the case that the method is
2138         subset or superset.
2139
2140 2004-01-30  Kenichi Handa  <handa@m17n.org>
2141
2142         * emacs.c (main): Call init_charset after syms_of_XXX.
2143
2144         * charset.c (Vcharset_map_directory): Deleted.
2145         (Vcharset_map_path): New variable
2146         (load_charset_map_from_file): Use Vcharset_map_path instead.
2147         (init_charset): Initialize Vcharset_map_path.
2148         (syms_of_charset): Delete declaration of "charset-map-directory",
2149         add declaration of "charset-map-path".
2150
2151 2004-01-29  Kenichi Handa  <handa@m17n.org>
2152
2153         * fns.c (string_char_to_byte): Optimize for ASCII only string.
2154         (string_byte_to_char): Likewise.
2155
2156         * fileio.c (Finsert_file_contents): Avoid detecting a code twice.
2157
2158         * coding.c (detect_coding_iso_2022): Fix handling of SS2 and SS3.
2159         (detect_coding): Treat '\0' as normal ASCII byte..
2160         (detect_coding_system): Likewise.
2161
2162 2004-01-27  Kenichi Handa  <handa@m17n.org>
2163
2164         * coding.h (SJIS_TO_JIS2, JIS_TO_SJIS2): New macros.
2165
2166         * coding.c (QCmnemonic, QCdefalut_char)
2167         (QCdecode_translation_table, QCencode_translation_table)
2168         (QCpost_read_conversion, QCpre_write_conversion): New variables.
2169         (get_translation_table): Return a list of translation tables if
2170         necessary.
2171         (decode_coding): Call get_translation_table with ENCODEP 0.
2172         (char_encodable_p): If translation_table is non-nil, always call
2173         translate_char.
2174         (Fdefine_coding_system_internal): Accept list of translation
2175         tables as :encode-translation-table and :decode-translation-table.
2176         (Fcoding_system_put): New function.
2177         (syms_of_coding): Declare new symbols.  Defsubr
2178         Scoding_system_put.
2179         (decode_coding_sjis): Handle 4th charset (typically JISX0212).
2180         (encode_coding_sjis): Likewise.
2181
2182         * charset.c (map_charset_chars): Fix arg to map_charset_chars in
2183         when the charset is superset type.
2184
2185         * character.c (translate_char): Accept list of translation tables.
2186
2187 2004-01-25  Kenichi Handa  <handa@m17n.org>
2188
2189         * coding.h (enum coding_attr_index): New member
2190         coding_attr_trans_tbl.
2191         (CODING_ATTR_TRANS_TBL): New macro.
2192
2193         * coding.c (get_translation_table): New function.
2194         (translate_chars): Fix the bug of skipping annotation data.
2195         (decode_coding): Utilze get_translation_table.
2196         (encode_coding): Likewise.
2197         (char_encodable_p): Translate char if necessary.
2198         (Funencodable_char_position): Likewise.
2199         (Ffind_coding_systems_region_internal): Setup translation table
2200         for encode in a coding system attribute vector in advance.
2201         (Fcheck_coding_systems_region): Likewise.
2202         (Fdefine_coding_system_internal): Allow a symbol as translation
2203         table.  For shift-jis type coding system, allow 4th charset.
2204
2205 2004-01-24  Kenichi Handa  <handa@m17n.org>
2206
2207         * coding.c (decode_coding_sjis): Check the first byte rigidly.
2208
2209         * xdisp.c (get_next_display_element): Pass -1 as POS to
2210         FACE_FOR_CHAR if displaying a C-string.
2211
2212 2004-01-23  Kenichi Handa  <handa@m17n.org>
2213
2214         * composite.c (get_composition_id): Handle xoff and yoff in a
2215         composition rule.
2216
2217         * composite.h (COMPOSITION_DECODE_RULE): New arg xoff and yoff.
2218         (struct composition): New member lbearing and rbearing.
2219
2220         * xdisp.c (move_it_to): Optimize for the case (op & MOVE_TO_Y).
2221         (x_get_glyph_overhangs): Handle a composition glyph.
2222         (x_produce_glyphs): Setup lbearing and rbreaing for a composition
2223         glyph.
2224
2225         * xterm.c (x_compute_glyph_string_overhangs): Handle also a
2226         composition glyph.
2227
2228 2004-01-18  Kenichi Handa  <handa@m17n.org>
2229
2230         * print.c: Include charset.h.
2231         (Vprint_charset_text_property): New variable.
2232         (Qdefault): Extern it.
2233         (PRINT_STRING_NON_CHARSET_FOUND)
2234         (PRINT_STRING_UNSAFE_CHARSET_FOUND): New macros.
2235         (print_check_string_result): New variable.
2236         (print_check_string_charset_prop): New function.
2237         (print_prune_charset_plist): New variable.
2238         (print_prune_string_charset): New function.
2239         (print_object): Call print_prune_string_charset if
2240         Vprint_charset_text_property is not t.
2241         (print_interval): Print nothing if itnerval->plist is nil.
2242         (syms_of_print): Declare Vprint_charset_text_property as a lisp
2243         variable.  Init and staticpro print_prune_charset_plist.
2244
2245 2004-01-15  Kenichi Handa  <handa@m17n.org>
2246
2247         * fontset.c (new_fontset_from_font_name): Use the specified font
2248         for all characters in the new fontset.
2249
2250         * macterm.c (x_set_mouse_face_gc): Call FACE_FOR_CHAR with POS and
2251         OBJECT args.
2252
2253         * xdisp.c (x_produce_glyphs): Call FACE_FOR_CHAR with POS and
2254         OBJECT args for composition too.
2255
2256         * w32term.c (x_set_mouse_face_gc): Call FACE_FOR_CHAR with POS and
2257         OBJECT args.
2258
2259 2004-01-13  Kenichi Handa  <handa@m17n.org>
2260
2261         * dispextern.h (FACE_FOR_CHAR): New args POS and OBJECT.
2262
2263         * fontset.c (reorder_font_vector): Adjusted for the change of
2264         FONT_DEF format.
2265         (fontset_face): New arg id.  Caller changed.
2266         (face_for_char): New args pos and object.
2267         (make_fontset_for_ascii_face): Adjusted for the change of FONT_DEF
2268         format.n
2269         (fs_query_fontset): Check NAME by Fassoc too.
2270         (Fset_fontset_font): Allow non-XLFD font name.
2271         (Ffontset_info): Adjusted for the change of FONT_DEF format.
2272
2273         * fontset.h (face_for_char): Prototype adjusted.
2274
2275         * xdisp.c (face_before_or_after_it_pos): Call FACE_FOR_CHAR with
2276         POS and OBJECT args.
2277         (get_next_display_element): Likewise.
2278         (append_space): Likewise.
2279         (extend_face_to_end_of_line): Likewise.
2280         (get_char_face_and_encoding): Likewise.
2281         (BUILD_COMPOSITE_GLYPH_STRING): Likewise.
2282         (x_produce_glyphs): Likewise.
2283
2284         * xfaces.c (compute_char_face): Call FACE_FOR_CHAR with
2285         POS and OBJECT args.
2286
2287         * xterm.c (x_set_mouse_face_gc): Call FACE_FOR_CHAR with
2288         POS and OBJECT args.
2289
2290 2004-01-03  Jason Rumney  <jasonr@gnu.org>
2291
2292         * w32select.c (Fw32_set_clipboard_data): Avoid potential realloc
2293         of GlobalAlloc'ed memory.
2294
2295 2003-12-29  Kenichi Handa  <handa@m17n.org>
2296
2297         * ccl.c (Fccl_execute_on_string): Fix the condition of loop.
2298
2299         * charset.h (charset_table_used): Delete extern.
2300
2301         * charset.c (charset_table_used): Make it static.
2302         (map_charset_chars): Fix args to c_function with.
2303
2304         * chartab.c (map_sub_char_table_for_charset): Fix args to
2305         c_function with.
2306
2307         * coding.h (enum coding_result_code): Delete
2308         CODING_RESULT_INSUFFICIENT_CMP, add CODING_RESULT_INVALID_SRC.
2309
2310         * coding.c (Qinsufficient_source, Qinconsistent_eol)
2311         (Qinvalid_source, Qinterrupted, Qinsufficient_memory): New
2312         variables.
2313         (Vlast_code_conversion_error): New variables.
2314         (syms_of_coding): DEFSYM or DEFVAR_LISP them.
2315         (ONE_MORE_BYTE): Record error if any instead of signaling an
2316         error.  If non-ASCII multibyte char is found, return the negative
2317         value of the code.  All callers changed to check it.
2318         (ONE_MORE_BYTE_NO_CHECK): Likewise.
2319         (record_conversion_result): New function.  All codes setting
2320         coding->result are changed to call this function.
2321         (detect_coding_utf_8): Don't use the local variable incomplete.
2322         (decode_coding_utf_8): Likewise.
2323         (emacs_mule_char): Change the second arg to `const'.
2324         (detect_coding_emacs_mule): Don't use the local variable
2325         incomplete.
2326         (detect_coding_sjis): Likewise.
2327         (detect_coding_big5): Likewise.
2328         (decode_coding): Fix of flushing out unprocessed data.
2329         (make_conversion_work_buffer): Fix making of a work buffer.
2330         (decode_coding_object): Return coding->dst_object;
2331
2332         * fontset.c (set_fontset_font): Fix args.
2333
2334         * lisp.h (CHARACTERBITS): Define as 22.
2335
2336         * process.c (send_process): Be sure to set coding->src_multibyte.
2337
2338         * xdisp.c (handle_auto_composed_prop): Fix setting of limit.
2339
2340 2003-12-02  Kenichi Handa  <handa@m17n.org>
2341
2342         * xdisp.c (handle_auto_composed_prop): Give limit to
2343         Fnext_single_char_property_change.
2344
2345 2003-12-02  Kenichi Handa  <handa@m17n.org>
2346
2347         * coding.c (detect_coding): Fix previous change.
2348         (detect_coding_system): Likewise.
2349
2350 2003-12-02  Kenichi Handa  <handa@m17n.org>
2351
2352         * composite.c (syms_of_composite): Don't make the compostion hash
2353         table week.
2354
2355         * fontset.c (Fset_fontset_font): Fix docstring.
2356
2357         * lisp.h (detect_coding_system): Adjust prototype.
2358
2359         * fileio.c (kill_workbuf_unwind): Delete this function.
2360         (Finsert_file_contents): Adjust the call of detect_coding_system.
2361         Get conversion_buffer by code_conversion_save.  Use the macor
2362         CODING_MAY_REQUIRE_DECODING.  After decoding, update
2363         coding_system.
2364
2365         * coding.h (make_conversion_work_buffer): Delete extern.
2366         (code_conversion_save): Extern it.
2367
2368         * coding.c (enum iso_code_class_type): Delete ISO_carriage_return.
2369         (CODING_GET_INFO): Delete argument eol_type.  Callers changed.
2370         (decode_coding_utf_8): Don't do eol converion.
2371         (detect_coding_utf_16): Check coding->src_chars, not
2372         coding->src_bytes.  Add heuristics for those that have no
2373         signature.
2374         (decode_coding_emacs_mule): Don't do eol converion.
2375         (decode_coding_iso_2022): Likewise.
2376         (decode_coding_sjis): Likewise.
2377         (decode_coding_big5): Likewise.
2378         (decode_coding_charset): Likewise.
2379         (adjust_coding_eol_type): Return a new coding system.
2380         (detect_coding): Don't detect eol.  Fix for utf-16 detection.
2381         (decode_eol): In case of CRLF->LF conversion, use del_range_2 on
2382         each change.
2383         (decode_coding): Pay attention to undo_list.  Do eol convesion for
2384         all types of coding-systems (if necessary).
2385         (Vcode_conversion_work_buf_list): Delete it.
2386         (Vcode_conversion_reused_workbuf): Renamed from
2387         Vcode_conversion_reused_work_buf.
2388         (Vcode_conversion_workbuf_name): New variable.
2389         (reused_workbuf_in_use): New variable.
2390         (make_conversion_work_buffer): Delete the arg DEPTH.
2391         (code_conversion_restore): Argument changed to cons.
2392         (code_conversion_save): Delete the argument BUFFER.  Callers
2393         changed.
2394         (detect_coding_system): New argument src_chars.  Callers changed.
2395         Fix for utf-16 detection.
2396         (init_coding_once): Don't use ISO_carriage_return.
2397         (syms_of_coding): Initialized Vcode_conversion_workbuf_name and
2398         reused_workbuf_in_use.
2399
2400 2003-11-24  Kenichi Handa  <handa@m17n.org>
2401
2402         * keymap.c (store_in_keymap): Pay attention to the case that idx
2403         is a cons specifying a character range.
2404
2405         * coding.c (Fdefine_coding_system_internal): Fix previous change.
2406
2407 2003-11-23  Kenichi Handa  <handa@m17n.org>
2408
2409         * xdisp.c (handle_auto_composed_prop): Fix the case of returning
2410         HANDLED_RECOMPUTE_PROPS.
2411
2412         * coding.c (Fdefine_coding_system_internal): Fix checking of
2413         ascii compatibility.
2414
2415 2003-11-22  Kenichi Handa  <handa@m17n.org>
2416
2417         * charset.c (find_charsets_in_text): Delete unused locale
2418         variable.
2419         (Fset_charset_priority): Update Vemacs_mule_charset_list too.
2420
2421         * coding.c (encode_coding_emacs_mule): Emit bytes with MSB.
2422         Resync charset_list to Vemacs_mule_charset_list.
2423
2424         * keymap.c (store_in_keymap): Pay attention to the case that idx
2425         is a cons specifying a character range.
2426
2427 2003-11-18  Kenichi Handa  <handa@m17n.org>
2428
2429         * composite.c (update_compositions): Bind inhibit-read-only, etc
2430         to t before calling remove-list-of-text-properties.
2431
2432         * print.c (print_object): Always print ASCII chars as is.
2433
2434 2003-11-17  Kenichi Handa  <handa@m17n.org>
2435
2436         * keymap.c (Fdefine_key): Fix handling of Lucid style event type
2437         list.
2438
2439         * fns.c (Fmapconcat): Signal an error if SEQUENCE is a char table.
2440         (Fmapcar): Likewise.
2441         (Fmapc): Likewise.
2442
2443 2003-11-15  Kenichi Handa  <handa@m17n.org>
2444
2445         * syntax.c (skip_chars): Be sure to alloca char_ranges when
2446         necessary.
2447
2448 2003-11-14  Kenichi Handa  <handa@m17n.org>
2449
2450         * xfaces.c (set_lface_from_font_name): Fix for the case that
2451         FONTNAME is not fontset name.
2452
2453 2003-11-13  Kenichi Handa  <handa@m17n.org>
2454
2455         * fns.c (base64_encode_1): Fix previous change.
2456
2457 2003-11-08  Kenichi Handa  <handa@m17n.org>
2458
2459         * fontset.c (set_fontset_font): New function.
2460         (Fset_fontset_font): If a font is specified for a charset, use
2461         map_charset_chars to store the font spec in a fontset.
2462
2463 2003-10-29  Kenichi Handa  <handa@m17n.org>
2464
2465         * fontset.c (fontset_face): Create a fallback fontset on demand
2466         (make_fontset): Don't create a fallback fontset here.
2467         (free_face_fontset): Free a fallback fontset (if any) too.
2468         (n_auto_fontsets): Delete this variable.
2469         (auto_fontset_alist): New variable.
2470         (new_fontset_from_font_name): Check auto_fontset_alist.
2471         (dump_fontset) [FONTSET_DEBUG]: Fully re-written.
2472         (Ffontset_list_all) [FONTSET_DEBUG]: New function.
2473         (syms_of_fontset): Initialize and staticpro auto_fontset_alist.
2474         Defsubr Sfontset_list_all.
2475
2476 2003-10-24  Kenichi Handa  <handa@m17n.org>
2477
2478         * xterm.c (x_list_fonts): Fix excluding of auto-scaled fonts.
2479
2480 2003-10-23  Kenichi Handa  <handa@m17n.org>
2481
2482         * fontset.c (Fnew_fontset): Check NAME more rigidly.
2483
2484 2003-10-17  Kenichi Handa  <handa@m17n.org>
2485
2486         * editfns.c (Fgoto_char): Fix docstring.
2487
2488 2003-10-16  Kenichi Handa  <handa@m17n.org>
2489
2490         * insdel.c (insert_from_gap): Adjust intervals correctly.
2491
2492 2003-10-12  Jason Rumney  <jasonr@gnu.org>
2493
2494         * w32term.c (GLYPHSET, WCRANGE): Define if system headers don't.
2495         (pfnGetFontUnicodeRanges): New dynamically loaded function.
2496         (w32_initialize): Try to load it.
2497         (x_get_font_repertory): Use it if available.
2498         (w32_encode_char): Add shortcut for unicode output.
2499
2500         * w32fns.c (w32_load_system_font): Default charset to -1.
2501         (x_to_w32_charset): Match all fonts for unicode.
2502         (w32_to_x_charset): New parameter matching. Don't return partial
2503         or wildcard charsets.
2504         (w32_to_all_x_charsets): Don't return partial or wildcard charsets.
2505         (w32_codepage_for_font): Return CP_UNICODE for unicode.
2506         (w32_to_x_font): Match charset to real charset.
2507         (enum_font_cb2): Always list unicode versions.
2508
2509         * makefile.w32-in (temacs): Increase EMHEAP.
2510
2511 2003-10-11  Jason Rumney  <jasonr@gnu.org>
2512
2513         * w32term.c (w32_encode_char): New charset parameter.
2514         font_info.encoding becomes encoding_type.
2515         (x_get_font_repertory): New function. Warning: stub only!
2516         (x_new_font): Return quickly if font already set.
2517         (x_new_fontset): fontsetname parameter is Lisp_Object.
2518         Use new fs_query_fontset. Try new_fontset_from_font_name. Use
2519         fontset_name for return value.
2520
2521         * w32term.h: Declare x_get_font_repertory.
2522
2523         * w32select.c (Fw32_set_clipboard_data): Use string_x_string_p in
2524         place of find_charset_in_text. Use encode_coding_object in place
2525         of encode_coding.
2526         (Fw32_get_clipboard_data): Use decode_coding_c_string in place of
2527         decode_coding.
2528
2529         * w32fns.c (Fx_create_frame, x_create_tip_frame): Use new version
2530         of x_new_fontset.
2531         (w32_load_system_font): Initialize charset as unicode.
2532         font_info.encoding becomes encoding_type.
2533         (w32_to_x_font): Use decode_coding_c_string in place of
2534         decode_coding.
2535         (x_to_w32_font): Use encode_coding_object in place of
2536         encode_coding.
2537         (syms_of_w32fns): Set get_font_repertory_func.
2538
2539         * w32console.c: Include character.h. Use terminal_encode_buffer
2540         from term.c.
2541         (write_glyphs): Use new version of encode_terminal_code. Use
2542         encode_coding_object in place of encode_coding.
2543
2544         * w32bdf.c (w32_load_bdf_font): Clear font_info before filling.
2545         encoding becomes encoding_type.
2546
2547         * term.c (terminal_encode_buffer): Make externally visible.
2548
2549         * makefile.w32-in: Add character.h dependancies.
2550         (character.o, chartab.o): New targets.
2551
2552 2003-10-10  Kenichi Handa  <handa@m17n.org>
2553
2554         * fileio.c (Finsert_file_contents) [DOS_NT]: Use the macro
2555         CODING_ID_EOL_TYPE..
2556
2557 2003-10-07  Andreas Schwab  <schwab@suse.de>
2558
2559         * coding.c (produce_chars): Revert last change.
2560
2561 2003-10-06  Kenichi Handa  <handa@m17n.org>
2562
2563         * charset.h (charset_unicode): Extern it.
2564
2565         * charset.c (string_xstring_p): Check by (C >= 0x100).
2566         (find_charsets_in_text): Format of the arc CHARSETS changed.  New
2567         arg MULTIBYTE.
2568         (Ffind_charset_region, Ffind_charset_string): Adjusted for the
2569         change of find_charsets_in_text.
2570         (Fsplit_char): Fix doc.  Never return unknown.
2571
2572         * chartab.c (char_table_translate): Use CHARACTERP, not INETEGERP.
2573
2574         * coding.c (Fdefine_coding_system_alias): Update
2575         Vcoding_system_list.
2576
2577         * fontset.c (load_font_get_repertory): Pay attention to the case
2578         that ENCODING of a font is specified by a char-table.
2579
2580         * xterm.c (x_get_font_repertory): Handle the case that the
2581         encoding of font is other than Unicode.
2582
2583 2003-10-02  Kenichi Handa  <handa@m17n.org>
2584
2585         * term.c (encode_terminal_code): Don't handle glyph-table.  Check
2586         if a character is encodable by the terminal coding system.  If
2587         not, produces proper number of `?'s.  Update
2588         terminal_encode_buffer and terminal_encode_buf_size if necessary.
2589         (produce_glyphs): Check by CHAR_BYTE8_P, not SINGLE_BYTE_CHAR_P.
2590
2591 2003-10-01  Kenichi Handa  <handa@m17n.org>
2592
2593         * term.c (terminal_encode_buffer, terminal_encode_buf_size): New
2594         variables.
2595         (encode_terminal_code): Argument changed.  Encode multiple
2596         characters at once.  Store the result of encoding in
2597         terminal_encode_buffer.
2598         (write_glyphs): Adjusted for the change of encode_terminal_code.
2599         (insert_glyphs): Likewise.
2600         (term_init): Initialize terminal_encode_buffer and
2601         terminal_encode_buf_size.
2602
2603         * coding.c (consume_chars): If coding->src_object is nil, don't
2604         check annotation.
2605
2606 2003-09-30  Kenichi Handa  <handa@m17n.org>
2607
2608         * character.c (char_string): Use ASCII_CHAR_P instead of
2609         SINGLE_BYTE_CHAR_P.
2610
2611 2003-09-30  Kenichi Handa  <handa@m17n.org>
2612
2613         * xdisp.c (handle_auto_composed_prop): Check if the last
2614         characters of auto-composed region is newly composed with the
2615         following characters.
2616         (handle_composition_prop): Fix checking of point being inside
2617         composition.
2618
2619 2003-09-26  Kenichi Handa  <handa@m17n.org>
2620
2621         * fns.c (concat): Don't change multibyteness of the result by
2622         concatenating an 8-bit character.
2623
2624         * data.c (Faset): Check newelt by CHECK_CHARACTER.  Don't change
2625         multibyteness of the result when newelt is an 8-bit character.
2626
2627 2003-09-29  Dave Love  <fx@gnu.org>
2628
2629         * xmenu.c (find_and_call_menu_selection): Make menu_bar_items_used
2630         EMACS_INT.
2631
2632         * xfns.c (DefaultDepthOfScreen, x_encode_text): Remove unused vars.
2633
2634         * xfaces.c (face_numeric_value): Declare dim size_t.
2635         (Finternal_lisp_face_equal_p): Remove unused f.
2636
2637         * xdisp.c (BUILD_CHAR_GLYPH_STRINGS, display_and_set_cursor)
2638         (MATRIX_ROW): Remove unused vars.
2639         (draw_glyphs, x_insert_glyphs, fast_find_position)
2640         (fast_find_position, fast_find_string_pos): Use EMACS_INT for
2641         byte/char counts.
2642
2643         * regex.c (regex_compile): Remove unused var.
2644
2645         * minibuf.c (Fminibuffer_complete_word): Remove unused var.
2646
2647         * keymap.c (Fset_keymap_parent, map_keymap, Fcopy_keymap)
2648         (Faccessible_keymaps, where_is_internal): Remove unused vars.
2649
2650         * keyboard.c (cancel_hourglass_unwind): Return Qnil.
2651
2652         * frame.c (frame_name_fnn_p): Make len EMACS_INT.
2653
2654         * fileio.c (Fwrite_region): Remove unused var.
2655
2656         * dispnew.c (adjust_frame_glyphs_for_frame_redisplay)
2657         (adjust_frame_glyphs_for_window_redisplay): Remove unused ch_dim.
2658
2659         * composite.c (Fremove_list_of_text_properties): Declare.
2660
2661         * coding.c (inhibit_pre_post_conversion): Removed (unused).
2662         (alloc_destination, produce_chars): Use EMACS_INT for byte/char
2663         counts.
2664         (coding_inherit_eol_type): Remove unused attrs.
2665         (detect_coding): Cast arg of detect_eol.
2666
2667         * charset.c (syms_of_charset): Remove unused var p.
2668         (find_charsets_in_text, Ffind_charset_region): Use EMACS_INT for
2669         byte/char counts.
2670
2671         * casetab.c (set_case_table): Remove unused var.
2672
2673         * window.c (Fdisplay_buffer, Fframe_selected_window): Remove
2674         unsued vars.
2675
2676 2003-09-26  Dave Love  <fx@gnu.org>
2677
2678         * xterm.c (x_bitmap_mask): Declare.
2679
2680 2003-09-17  Dave Love  <fx@gnu.org>
2681
2682         * xterm.c (x_term_init): Fix type error.
2683
2684         * lisp.h: Add Funibyte_char_to_multibyte.
2685
2686         * coding.c (Fread_coding_system): Fix arg of XSETSTRING.
2687         (Fset_coding_system_priority): Doc fix.
2688
2689         * alloc.c: Sync with HEAD version.
2690
2691         * ccl.c (ccl_driver): Fix arg of CHARACTERP.
2692
2693         * indent.c (check_composition): Make start and end EMACS_INT.
2694
2695         * character.c (lisp_string_width): Make ignore and end EMACS_INT.
2696
2697         * xdisp.c (handle_composition_prop, check_point_in_composition):
2698         Make buffer positions EMACS_INT.
2699
2700         * composite.c (find_composition, run_composition_function)
2701         (update_compositions, Ffind_composition_internal): Make buffer
2702         positions EMACS_INT.
2703
2704         * composite.h (find_composition, update_compositions): Make
2705         position args EMACS_INT.
2706
2707         * keyboard.c (adjust_point_for_property): Make beg and end
2708         EMACS_INT.
2709
2710         * intervals.c (get_property_and_range)
2711         * intervals.h (get_property_and_range): Make start and end EMACS_INT.
2712
2713         * unexalpha.c: Don't include varargs.h.
2714
2715 2003-09-16  Dave Love  <fx@gnu.org>
2716
2717         * coding.h (ENCODE_UTF_8): New.
2718
2719         * Makefile.in (gtkutil.o): Depend on coding.h.
2720
2721         * coding.c (Fset_coding_system_priority): Doc fix.
2722
2723 2003-09-16  Kenichi Handa  <handa@m17n.org>
2724
2725         * fileio.c (Finsert_file_contents): Call setup_coding_system in
2726         the case of auto saving.
2727
2728 2003-09-10  Andreas Schwab  <schwab@suse.de>
2729
2730         * chartab.c (map_char_table): Protect `range' from GC.
2731         (map_char_table_for_charset): Likewise.
2732
2733 2003-07-09  Kenichi Handa  <handa@m17n.org>
2734
2735         * coding.c (decode_coding_sjis): Check bytes more rigidly.
2736
2737 2003-06-26  Kenichi Handa  <handa@m17n.org>
2738
2739         * fileio.c (choose_write_coding_system): Return a decided coding
2740         system.
2741         (Fwrite_region): Set Vlast_coding_system_used to the return value
2742         of choose_write_coding_system.
2743
2744 2003-06-06  Kenichi Handa  <handa@m17n.org>
2745
2746         * charset.c (Fset_charset_priority): Pay attention to duplicated
2747         arguments.
2748
2749         * coding.c (QCcategory): New variable.
2750         (syms_of_coding): Defsym it.  Set all elements of
2751         Vcoding_category_table and their symbol values.
2752         (Fset_coding_system_priority): Doc fix.  Update symbol qvalues of
2753         coding-category-XXX, and coding-category-list.
2754         (Fdefine_coding_system_internal): Add category in the plist.
2755
2756 2003-06-05  Kenichi Handa  <handa@m17n.org>
2757
2758         * callproc.c (Fcall_process): Handle carryover correctly.
2759
2760         * coding.c (decode_coding_iso_2022): Fix handling of invalid
2761         bytes.
2762         (raw_text_coding_system): Check NILP (coding_system).
2763         (coding_inherit_eol_type): Check NILP (coding_system) and
2764         NILP (parent).
2765         (consume_chars): Fix for the case of raw-text.
2766
2767         * process.c (read_process_output): Handle carryover correctly.
2768
2769 2003-06-02  Dave Love  <fx@gnu.org>
2770
2771         * regex.c (re_search_2): Fix last change.
2772
2773 2003-05-30  Kenichi Handa  <handa@m17n.org>
2774
2775         * regex.c (GET_CHAR_BEFORE_2): Check multibyte, not
2776         target_multibyte.  Even in a unibyte case, return a converted
2777         multibyte char.
2778         (GET_CHAR_AFTER): New macro.
2779         (PATFETCH): Translate via multibyte char.
2780         (HANDLE_UNIBYTE_RANGE): Delete this macro.
2781         (SETUP_MULTIBYTE_RANGE): New macro.
2782         (regex_compile): Setup compiled code so that its multibyteness
2783         matches that of a target.  Fix the handling of "[X-YZ]" using
2784         SETUP_MULTIBYTE_RANGE.
2785         (analyse_first) <charset>: For filling fastmap for all multibyte
2786         characters, don't check by BASE_LEADING_CODE_P.
2787         (re_search_2): Don't check RE_TARGET_MULTIBYTE_P (bufp).  It is
2788         the same as RE_MULTIBYTE_P (bufp) now.
2789         (mutually_exclusive_p): Check by (! multibyte ||
2790         IS_REAL_ASCII (c)).
2791         (TARGET_CHAR_AND_LENGTH): Delete this macro.
2792         (TRANSLATE_VIA_MULTIBYTE): New macro.
2793         (re_match_2_internal): Don't check RE_TARGET_MULTIBYTE_P (bufp).
2794         It is the same as RE_MULTIBYTE_P (bufp) now.
2795         <exactn>: Translate via multibyte.
2796         <anychar>: Fetch a character by RE_STRING_CHAR_AND_LENGTH.  Don't
2797         translate it.
2798         <charset, charset_not>: Fetch a character by
2799         RE_STRING_CHAR_AND_LENGTH.  Translate via multibyte.
2800         <duplicate>: Call bcmp_translate with the last arg `multibyte'.
2801         <wordbound, notwordbound, wordbeg, wordend, syntaxspec,
2802         notsyntaxspec, categoryspec, notcategoryspec> Fetch a character
2803         by GET_CHAR_AFTER.
2804         (bcmp_translate):  Likewise.
2805
2806         * search.c (compile_pattern): Check the member target_multibyte,
2807         not the member multibyte of buf.
2808
2809         * lread.c (read1): While reading a string, set force_singlebyte
2810         and force_multibyte correctly.
2811
2812         * charset.c (Fset_unibyte_charset): Fix setting up of
2813         unibyte_to_multibyte_table.
2814         (init_charset_once): Likewise.
2815
2816 2003-05-29  Kenichi Handa  <handa@m17n.org>
2817
2818         * coding.c (setup_coding_system): If coding has
2819         post-read-conversion or pre-write-conversion, set
2820         CODING_REQUIRE_DECODING_MASK and CODING_REQUIRE_ENCODING_MASK
2821         respectively.
2822         (decode_coding_gap): Run post-read-conversion if any.
2823
2824         * fileio.c (Finsert_file_contents): Even if we read into a
2825         unibyte buffer, check if we must decode the result or not.
2826
2827 2003-05-29  Kenichi Handa  <handa@m17n.org>
2828
2829         * coding.c (make_conversion_work_buffer): Change the work buffer
2830         name to the same one as that of Emacs 21.
2831
2832 2003-05-28  Kenichi Handa  <handa@m17n.org>
2833
2834         * coding.h (make_conversion_work_buffer): Prototype adjusted.
2835         (code_conversion_restore): Don't extern it.
2836
2837         * coding.c (detected_mask): Delete unused variable.
2838         (decode_coding_iso_2022): Pay attention to the byte sequence of
2839         CTEXT extended segment, and retain those bytes as is.
2840         (decode_coding_ccl): Delete unused variable `valids'.
2841         (setup_coding_system): Delete unused variable `category'.
2842         (consume_chars): Delete unused variable `category'.  Make it work
2843         for non-multibyte case.
2844         (make_conversion_work_buffer): Argument changed.
2845         (saved_coding): Delete unused variable.
2846         (code_conversion_restore): Don't check saved_coding->destination.
2847         (code_conversion_save): New function.
2848         (decode_coding_gap, encode_coding_gap): Call code_conversion_save
2849         instead of record_unwind_protect.
2850         (decode_coding_object, encode_coding_object): Likewise.  Recover
2851         PT.
2852         (detect_coding_system): Delete unused variable `mask'.
2853         (Fdefine_coding_system_internal): Delete unsed vaiable id;
2854
2855         * fileio.c (kill_workbuf_unwind): New function.
2856         (Finsert_file_contents): On replacing, call
2857         make_conversion_work_buffer with correct args, and call
2858         record_unwind_protect with the first arg kill_workbuf_unwind.
2859
2860         * lisp.h (Fgenerate_new_buffer_name): EXFUN it.
2861
2862 2003-05-20  Kenichi Handa  <handa@m17n.org>
2863
2864         * fontset.c (BASE_FONTSET_P): Check FONTSET_BASE, not
2865         FONTSET_NAME.
2866         (fontset_add): Fix for the case that TO is less than TO1.
2867         (Ffontset_info): Don't use fallback fontset on checking the
2868         default fontset.
2869         (dump_fontset): New function for debugging.
2870
2871         * coding.c (Fdefine_coding_system_internal): Fix for the case that
2872         coding_type is Qcharset.
2873
2874 2003-05-07  Kenichi Handa  <handa@m17n.org>
2875
2876         * chartab.c (map_sub_char_table): New argument DEFAULT_VAL.
2877         (map_char_table): Don't inherit the value from the parent on
2878         initializing VAL.  Adjusted for the above change.
2879
2880 2003-05-06  Kenichi Handa  <handa@m17n.org>
2881
2882         * coding.c (Qsignature, Qendian): Delete these variables.
2883         (syms_of_coding): Don't initialize them.
2884         (CATEGORY_MASK_UTF_16_AUTO): New macro.
2885         (detect_coding_utf_16): Add CATEGORY_MASK_UTF_16_AUTO in
2886         detect_info->found.
2887         (decode_coding_utf_16): Don't detect BOM here.
2888         (encode_coding_utf_16): Produce BOM if CODING_UTF_16_BOM (coding)
2889         is NOT utf_16_without_bom.
2890         (setup_coding_system): For a coding system of type utf-16, check
2891         if the attribute :endian is Qbig or not (not nil or not), and set
2892         CODING_REQUIRE_DETECTION_MASK if BOM detection is required.
2893         (detect_coding): If coding type is utf-16 and BOM detection is
2894         required, detect it.
2895         (Fdefine_coding_system_internal): For a coding system of type
2896         utf-16, check if the attribute :endian is Qbig or not (not nil or
2897         not).
2898
2899 2003-05-06  Kenichi Handa  <handa@m17n.org>
2900
2901         * coding.c (coding_set_source): Fix for the case that the current
2902         buffer is different from coding->src_object.
2903         (decode_coding_object): Don't use the conversion work buffer if
2904         DST_OBJECT is a buffer.
2905
2906 2003-05-04  Dave Love  <fx@gnu.org>
2907
2908         * lread.c (read_emacs_mule_char) [len==2]: Index
2909         emacs_mule_charset correctly.
2910
2911 2003-02-16  Dave Love  <fx@gnu.org>
2912
2913         * coding.c (Qbig5, Vbig5_coding_system, CATEGORY_MASK_BIG5)
2914         (detect_coding_big5, decode_coding_big5, encode_coding_big5)
2915         (Fdecode_big5_char, Fencode_big5_char): Deleted.  (Big5 no longer
2916         treated specially.)
2917         (setup_coding_system, coding_category, CATEGORY_MASK_ANY)
2918         (detected_mask): Remove Big5 bits.
2919
2920 2003-04-09  Kenichi Handa  <handa@m17n.org>
2921
2922         The following changes are to make the font rescaling facility
2923         compatible with Emacs 21.
2924
2925         * xfaces.c (Vface_font_rescale_alist): Renamed from
2926         Vface_resizing_fonts.
2927         (struct font_name): Rename member resizing_ratio to rescale_ratio.
2928         (font_rescale_ratio): Renamed from font_resizing_ratio.
2929         (split_font_name): Set font->rescale_ratio.
2930         (better_font_p): Pay attention to font->rescale_ratio.
2931         (build_scalable_font_name): Likewise.  Change RESX, and RESY
2932         fields.
2933         (syms_of_xfaces): Declare Vface_font_rescale_alist as a Lisp
2934         variable.
2935
2936 2003-03-28  Kenichi Handa  <handa@m17n.org>
2937
2938         * coding.c (Qutf_16_be_nosig, Qutf_16_be, Qutf_16_le_nosig)
2939         (Qutf_16_le): Remove these variables.
2940         (syms_of_coding): Don't DEFSYM them.
2941         (decode_coding_utf_16): Fix handling of BOM.
2942         (encode_coding_utf_16): Fix handling of BOM.
2943
2944 2003-03-14  Kenichi Handa  <handa@m17n.org>
2945
2946         * fileio.c (Finsert_file_contents): On replacing, before decoding
2947         the file into the work buffer, set point of the work buffer to the
2948         end.
2949
2950 2003-02-13  Dave Love  <fx@gnu.org>
2951
2952         * coding.c (Fcheck_coding_systems_region): Fix type errors.
2953
2954 2003-02-04  Dave Love  <fx@gnu.org>
2955
2956         * xterm.c (XTread_socket): Check Lisp types for Vx_keysym_table
2957         and fix C types.
2958
2959 2003-01-31  Kenichi Handa  <handa@m17n.org>
2960
2961         * xdisp.c (SKIP_GLYPHS): New macro.
2962         (set_cursor_from_row): Pay attention to string display properties.
2963
2964         * category.c (copy_category_entry): Fix for the case that RANGE
2965         is an integer.
2966
2967         * xterm.c (x_encode_char): Call ccl_driver with the last arg Qnil.
2968
2969         * w32term.c (w32_encode_char): Call ccl_driver with the last arg
2970         Qnil.
2971
2972 2003-01-30  Kenichi Handa  <handa@m17n.org>
2973
2974         * charset.c (Fcharset_id_internal): New function.
2975         (syms_of_charset): Defsubr it.
2976
2977         * coding.c (decode_coding_ccl, encode_coding_ccl): Call ccl_driver
2978         with the last arg charset_list acquired from coding.
2979         (Fdefine_coding_system_internal): For ccl-based coding system, fix
2980         the attribute coding_attr_ccl_valids.
2981
2982         * coding.h (enum define_coding_ccl_arg_index): Set the first
2983         member coding_arg_ccl_decoder to coding_arg_max.
2984
2985         * ccl.h (ccl_driver): Prototype adjusted.
2986
2987         * ccl.c (CCL_DECODE_CHAR, CCL_ENCODE_CHAR): New macros.
2988         (ccl_driver): New arg CHARSET_LIST.  Use the above macros instead
2989         of DECODE_CAHR, ENCODE_CHAR, CHAR_CHARSET.
2990         (Fccl_execute): Call ccl_driver with the last arg Qnil.
2991         (Fccl_execute_on_string): Likewise.
2992
2993 2003-01-11  Kenichi Handa  <handa@m17n.org>
2994
2995         * charset.h (ENCODE_CHAR): If the method is SUBSET or SUPERSET,
2996         call encode_char.
2997
2998         * charset.c (encode_char): Fix handling of methods SUBSET and
2999         SUPERSET.
3000
3001         * xterm.c (x_new_fontset): Fix previous change.
3002
3003 2003-01-10  Dave Love  <fx@gnu.org>
3004
3005         * composite.c (syms_of_composite): Make composition_hash_table
3006         weak.
3007
3008 2003-01-10  Kenichi Handa  <handa@m17n.org>
3009
3010         * dispextern.h (check_face_attributes, generate_ascii_font_name)
3011         (font_name_registry): Don't extern them.
3012         (split_font_name_into_vector, build_font_name_from_vector): Extern
3013         them.
3014
3015         * fontset.h (Qfontset): Don't extern it.
3016         (new_fontset_from_font_name): Extern it.
3017
3018         * fontset.c: Give 8 extra slots to fontset objects.
3019         (Qfontset_info): New variable.
3020         (syms_of_fontset): Defsym it.
3021         (FONTSET_FALLBACK): New macro.
3022         (fontset_face): Try also the default fontset.
3023         (make_fontset): Realize a fallback fontset from the default
3024         fontset.
3025         (generate_ascii_font_name): Moved from xfaces.c.  Rewritten by
3026         using split_font_name_into_vector and build_font_name_from_vector.
3027         (Fset_fontset_font): Access the elements of font_spec by enum
3028         FONT_SPEC_INDEX.  If font_spec is a string, extract the registry
3029         name by using split_font_name_into_vector.
3030         (Fnew_fontset): If no ASCII font is specified in FONTLIST,
3031         generate a proper font name from the fontset name.  Update
3032         Vfontset_alias_alist.
3033         (n_auto_fontsets): New variable.
3034         (new_fontset_from_font_name): New function.
3035         (Ffont_info): Store the information about fonts generated from the
3036         default fontset in the first extra slot of the returned
3037         char-table.
3038
3039         * xfaces.c (generate_ascii_font_name): Moved to fontset.c.
3040         (font_name_registry): Function deleted.
3041         (split_font_name_into_vector): New function.
3042         (build_font_name_from_vector): New function.
3043         (font_list): The argument REGISTRY is now a list of registry
3044         names.
3045         (choose_face_font): If we are choosing an ASCII font, and ATTRS
3046         specifies an explicit font name, return the name as is.  Make a
3047         list of registy names.
3048
3049         * xfns.c (x_set_font, x_create_tip_frame): Adjusted to the change
3050         of x_new_fontset.
3051         (Fx_create_frame): Don't call x_new_fontset here.  Just use
3052         x_list_fonts to check the existence of fonts.
3053
3054         * xterm.h (x_new_fontset): Prototype adjusted.
3055
3056         * xterm.c (x_new_fontset): Change the arg FONTSETNAME to Lisp
3057         string.  Use new_fontset_from_font_name to create a fontset from a
3058         font name.
3059
3060 2003-01-07  Dave Love  <fx@gnu.org>
3061
3062         * Makefile.in: Fix some dependencies.
3063
3064         * keymap.c (Fapropos_internal): Don't gcpro apropos_predicate but
3065         set it to nil before returning.
3066
3067         * composite.c (update_compositions): Fix type error.
3068
3069         * syntax.c (skip_chars, skip_syntaxes): Fix type errors.
3070
3071 2003-01-07  Kenichi Handa  <handa@m17n.org>
3072
3073         * xterm.c (x_new_font): Optimize for the case that the font is
3074         already set for the frame.
3075
3076 2003-01-06  Kenichi Handa  <handa@m17n.org>
3077
3078         * chartab.c (char_table_ascii): Check if the char table contents
3079         is sub-char-table or not.
3080         (char_table_set): Fix argument to char_table_ascii.
3081         (char_table_set_range): Likewise.
3082
3083         * coding.c (CATEGORY_MASK_RAW_TEXT): New macro.
3084         (detect_coding_utf_8, detect_coding_utf_16)
3085         (detect_coding_emacs_mule, detect_coding_iso_2022)
3086         (detect_coding_sjis, detect_coding_big5)
3087         (detect_coding_ccl, detect_coding_charset): Change argument MASK
3088         to DETECT_INFO.  Update DETECT_INFO and return 1 if the byte
3089         sequence is valid in this coding system.  Callers changed.
3090         (MAX_ANNOTATION_LENGTH): New macro.
3091         (ADD_ANNOTATION_DATA): New macro.
3092         (ADD_COMPOSITION_DATA): Argument changed.  Callers changed.  Call
3093         ADD_ANNOTATION_DATA.  The format of annotation data changed.
3094         (ADD_CHARSET_DATA): New macro.
3095         (emacs_mule_char): New argument ID.  Callers changed.
3096         (decode_coding_emacs_mule, decode_coding_iso_2022)
3097         (decode_coding_sjis, decode_coding_big5, decode_coding_charset):
3098         Produce charset annotation data in coding->charbuf.
3099         (encode_coding_emacs_mule, encode_coding_iso_2022): Pay attention
3100         to charset annotation data in coding->charbuf.
3101         (setup_coding_system): Add CODING_ANNOTATE_CHARSET_MASK
3102         coding->common_flags if the coding system is iso-2022 based and
3103         uses designation.
3104         (produce_composition): Adjusted for the new annotation data
3105         format.
3106         (produce_charset): New function.
3107         (produce_annotation): Handle charset annotation.
3108         (handle_composition_annotation, handle_charset_annotation): New
3109         functions.
3110         (consume_chars): Handle charset annotation.  Utilize the above two
3111         functions.
3112         (encode_coding_object): If SRC_OBJECT and DST_OBJECT are the same
3113         buffer, get the deleted text as a string and set
3114         coding->src_object to that string.
3115         (detect_coding, detect_coding_system): Use the new struct
3116         coding_detection_info.
3117
3118         * coding.h (struct coding_detection_info): New structure.
3119         (struct coding_system): Prototype of the member `detector'
3120         adjusted.
3121         (CODING_ANNOTATE_CHARSET_MASK): New macro.
3122
3123 2003-01-06  Kenichi Handa  <handa@m17n.org>
3124
3125         * insdel.c (insert_from_gap): Fix argument to offset_intervals.
3126
3127 2003-01-03  Dave Love  <fx@gnu.org>
3128
3129         * keymap.c (apropos_predicate, apropos_accumulate): Declare
3130         static.
3131         (Fapropos_internal): Don't gcpro apropos_accumulate.  Set result
3132         to new local and nullify apropos_accumulate before returning.
3133         (syms_of_keymap): Staticpro and initialize apropos_accumulate.
3134
3135 2002-12-05  Kenichi Handa  <handa@m17n.org>
3136
3137         * charset.c (Fdefine_charset_internal): Setup charset.fast_map
3138         correctly.
3139
3140 2002-11-26  Dave Love  <fx@gnu.org>
3141
3142         * fns.c (Flanginfo): Call synchronize_system_time_locale.
3143
3144 2002-11-07  Kenichi Handa  <handa@m17n.org>
3145
3146         The following changes are to make character composition happen
3147         automatically on displaying.
3148
3149         * Makefile.in (lisp, shortlisp): Add composite.elc
3150
3151         * composite.h (Qauto_composed, Vauto_composition_function,
3152         Qauto_composition_function): Extern them.
3153
3154         * composite.c (Vcomposition_function_table,
3155         Qcomposition_function_table): Delete variables.
3156         (Qauto_composed, Vauto_composition_function,
3157         Qauto_composition_function): New variables.
3158         (run_composition_function): Don't call
3159         compose-chars-after-function.
3160         (update_compositions): Clear `auto-composed' text property.
3161         (compose_chars_in_text): Delete this function.
3162         (syms_of_composite): Staticpro Qauto_composed and
3163         Qauto_composition_function.  Declare Vauto_composition_function as
3164         a Lisp variable.
3165
3166         * dispextern.h (enum prop_idx): Add member AUTO_COMPOSED_PROP_IDX.
3167
3168         * xdisp.c (it_props): Add an entry for Qauto_composed.
3169         (handle_auto_composed_prop): New function.
3170
3171         * xselect.c (selection_data_to_lisp_data): Don't call
3172         compose_chars_in_text.
3173
3174 2002-11-06  Dave Love  <fx@gnu.org>
3175
3176         * keyboard.c (read_char): Modify checking around use of
3177         Vkeyboard_translate_table.
3178
3179         * xterm.c (XTread_socket): Check Lisp types for Vx_keysym_table
3180         and fix C types.
3181
3182 2002-11-06  Kenichi Handa  <handa@m17n.org>
3183
3184         * coding.c (decode_coding_utf_8): When eol_type is Qdos, handle
3185         the case that the last byte is '\r' correctly.
3186         (decode_coding_emacs_mule): Likewise.
3187         (decode_coding_iso_2022): Likewise.
3188         (decode_coding_sjis): Likewise.
3189         (decode_coding_big5): Likewise.
3190         (decode_coding_charset): Likewise.
3191         (produce_chars): Likewise.
3192         (decode_coding): Flushing out the unprocessed data correctly.
3193         (decode_coding_gap): Set CODING_MODE_LAST_BLOCK bit of
3194         coding->mode.
3195
3196 2002-10-31  Dave Love  <fx@gnu.org>
3197
3198         * xterm.c (XTread_socket): Fix changes for defined keysyms.  Add
3199         XK_ISO... case.
3200         (xaw_scroll_callback): Revert last change.
3201
3202 2002-10-30  Kenichi Handa  <handa@m17n.org>
3203
3204         * charset.c (Fset_charset_priority): Update
3205         Viso_2022_charset_list.
3206
3207 2002-10-29  Kenichi Handa  <handa@m17n.org>
3208
3209         * xfaces.c (Vface_resizing_fonts): New variable.
3210         (struct font_name): New member `resizing_ratio'.
3211         (font_resizing_ratio): New function.
3212         (split_font_name): Set font->resizing_ratio.
3213         (better_font_p): Pay attention to font->resizing_ratio.
3214         (build_scalable_font_name): Likewise.  Don't change POINT_SIZE,
3215         RESX, and RESY fields.
3216         (try_alternative_families): Try scalable fonts if
3217         Vscalable_fonts_allowed is not Qt.
3218         (syms_of_xfaces): Declare Vface_resizing_fonts as a Lisp variable.
3219
3220 2002-10-29  Dave Love  <fx@gnu.org>
3221
3222         * xterm.c (xaw_scroll_callback): Cast correctly.
3223
3224 2002-10-28  Dave Love  <fx@gnu.org>
3225
3226         * keyboard.c (lispy_accent_codes, lispy_accent_keys): Extend.
3227         (lispy_kana_keys): Comment out.
3228         (make_lispy_event) [XK_kana_A]: Comment out.
3229
3230         * xterm.c (xaw_scroll_callback): Cast call_data.
3231         (XTread_socket): Deal with ASCII keysyms.
3232         (syms_of_xterm) <Vx_keysym_table>: Fix args of make_hash_table.
3233
3234 2002-10-27  Dave Love  <fx@gnu.org>
3235
3236         * xterm.c (Vx_keysym_table): New.
3237         (syms_of_xterm): Initialize it.
3238         (XTread_socket): Use it.
3239         From head: Eliminate incorrect optimization that tried to avoid
3240         decoding the output of X*LookupString.
3241         (x_get_font_repertory): Delete charset declaration.
3242
3243 2002-10-16  Kenichi Handa  <handa@m17n.org>
3244
3245         * coding.c (detect_coding): Fix previous change.
3246         (detect_coding_charset): If only ASCII bytes are found, return 0.
3247         (detect_coding_system): Fix previous change.
3248         (Fdefine_coding_system_internal): Setup CODING_ATTR_ASCII_COMPAT
3249         (attrs) correctly.
3250
3251 2002-10-15  Dave Love  <fx@gnu.org>
3252
3253         * coding.c (Fcheck_coding_system): Doc fix.
3254
3255         * editfns.c (Finsert_byte): Return a proper value.
3256
3257 2002-10-14  Kenichi Handa  <handa@m17n.org>
3258
3259         * coding.c (decode_coding): Fix args to translate_chars.  Pay
3260         attention to Vstandard_translation_table_for_decode.
3261         (encode_coding): Fix args to translate_chars.  Pay attention to
3262         Vstandard_translation_table_for_encode.
3263
3264         * data.c (Faset): Check NEWELT by ASCII_CHAR_P, not by
3265         SINGLE_BYTE_CHAR_P.
3266
3267         * editfns.c (general_insert_function): Check VAL by ASCII_CHAR_P,
3268         not by SINGLE_BYTE_CHAR_P.
3269
3270         * fns.c (concat): Check CH by ASCII_CHAR_P, not by
3271         SINGLE_BYTE_CHAR_P.
3272
3273         * insdel.c (copy_text): Check C by ASCII_CHAR_P, not by
3274         SINGLE_BYTE_CHAR_P.
3275
3276         * keymap.c (Ftext_char_description): Check C by ASCII_CHAR_P, not
3277         by SINGLE_BYTE_CHAR_P.
3278
3279         * search.c (Freplace_match): Check C by ASCII_CHAR_P, not by
3280         SINGLE_BYTE_CHAR_P.
3281
3282 2002-10-14  Dave Love  <fx@gnu.org>
3283
3284         * fns.c (Fstring_as_multibyte, Fstring_to_multibyte): Doc fix.
3285
3286 2002-10-10  Dave Love  <fx@gnu.org>
3287
3288         * fns.c (Flanginfo): Fix typo.
3289
3290         * unexelf.c (unexec): Make last change conditional on Irix 6.5.
3291
3292 2002-10-10  Kenichi Handa  <handa@m17n.org>
3293
3294         * coding.c (detect_coding_utf_8): Check incomplete byte sequence.
3295         Don't update *mask when correctly detected.
3296         (detect_coding_utf_16): Likewise.
3297         (detect_coding_emacs_mule): Likewise.
3298         (detect_coding_iso_2022): Likewise.
3299         (detect_coding_sjis): Likewise.
3300         (detect_coding_big5): Likewise.
3301         (detect_coding_ccl): Likewise.
3302         (decode_coding_sjis): Fix decoding of katakana-jisx0201.
3303         (detect_eol): Delete the argument CODING, and add the argument
3304         CATEGORY.
3305         (detect_coding): Adjusted for the changes above.
3306         (detect_coding_system): Likewise.
3307
3308 2002-10-09  Kenichi Handa  <handa@m17n.org>
3309
3310         * character.c (char_string): Renamed from
3311         char_string_with_unification.  Pay attention to
3312         CHAR_MODIFIER_MASK.
3313         (string_char): Renamed from string_char.
3314
3315         * character.h (CHAR_STRING): Call char_string if C is greater than
3316         MAX_3_BYTE_CHAR.
3317         (CHAR_STRING_ADVANCE): Likewise.
3318         (STRING_CHAR): Call string_char instead of
3319         string_char_with_unification.
3320         (STRING_CHAR_AND_LENGTH): Likewise.
3321         (STRING_CHAR_ADVANCE): Likewise.
3322
3323 2002-10-09  Dave Love  <fx@gnu.org>
3324
3325         * coding.c (decode_coding_utf_8): Treat surrogates as invalid.
3326
3327 2002-10-07  Kenichi Handa  <handa@m17n.org>
3328
3329         * keymap.c (push_key_description): Pay attention to
3330         force_multibyte.
3331
3332         * regex.c (re_search_2): Fix for the case of unibyte buffer.
3333
3334 2002-10-06  Dave Love  <fx@gnu.org>
3335
3336         * charset.c (define_charset_internal): Rename `supprementary'.
3337
3338         * Makefile.in (lisp, shortlisp): Remove latin-N.
3339
3340 2002-10-05  Dave Love  <fx@gnu.org>
3341
3342         * xfns.c (x_window, x_window): Use use_xim.
3343
3344         * xterm.c (use_xim): Initialize.
3345         (xim_open_dpy, xim_initialize, xim_close_dpy): Use use_xim.
3346         (x_term_init): Maybe set use_xim.
3347
3348         * xterm.h (use_xim) [HAVE_X_I18N]: Declare.
3349
3350 2002-10-01  Kenichi Handa  <handa@m17n.org>
3351
3352         * search.c (search_buffer): Fix case-fold-search of multibyte
3353         characters.
3354         (boyer_moore): Rename the last argument to char_high_bits.
3355
3356 2002-09-27  Kenichi Handa  <handa@m17n.org>
3357
3358         * xdisp.c (display_string): Fix for the case of zero width glyph.
3359
3360         * xfns.c (x_set_font): Change the error message of the case that
3361         x_new_fontset returns Qt.
3362
3363         * xfaces.c (set_lface_from_font_name): Reject the default fontset.
3364         (Finternal_set_lisp_face_attribute): Use signal_error for the
3365         error of invalid fontset.
3366
3367         * xterm.c (x_new_fontset): If FONTSETNAME specifies the default
3368         fontset, return Qt.
3369
3370 2002-09-19  Kenichi Handa  <handa@m17n.org>
3371
3372         * regex.c (re_search_2): Fix previous change.
3373
3374 2002-09-18  Kenichi Handa  <handa@m17n.org>
3375
3376         * syntax.c (skip_syntaxes): Fix previous change.
3377
3378 2002-09-13  Kenichi Handa  <handa@m17n.org>
3379
3380         * syntax.c (skip_chars): Fix previous change.
3381         (skip_syntaxes): Fix previous change.
3382
3383 2002-09-06  Dave Love  <fx@gnu.org>
3384
3385         * config.in: Restore it.
3386
3387 2002-09-05  Dave Love  <fx@gnu.org>
3388
3389         * config.in: Removed (now auto-generated).
3390
3391         * s/usg5-4.h: Fix last change.
3392
3393         * unexelf.c (unexec): Make .got handling not SGI-specific.
3394
3395         * syntax.c (syms_of_syntax) <multibyte-syntax-as-symbol>: Doc fix.
3396
3397         * regex.c: Use `ifdef HAVE_ALLOCA_H', not `if HAVE_ALLOCA_H'.
3398
3399         * keyboard.c (read_key_sequence): Fix type error.
3400
3401         * buffer.c (Fset_buffer_multibyte, Fset_buffer_multibyte): Fix
3402         type error.
3403
3404         * fontset.c (fontset_add): Return Lisp_Object.
3405
3406 2002-09-03  Dave Love  <fx@gnu.org>
3407
3408         * charset.h (charset_ordered_list_tick): Declare extern.
3409
3410 2002-09-03  Kenichi Handa  <handa@m17n.org>
3411
3412         The following changes (and some of 2002-08-20 changes of mine) are
3413         for handling syntax, category, and case conversion for unibyte
3414         characters by converting them to multibyte on the fly.  With these
3415         changes, we don't have to setup syntax and case tables for unibyte
3416         characters in each language environment.
3417
3418         * abbrev.c (Fexpand_abbrev): Convert a unibyte character to
3419         multibyte if necessary.
3420
3421         * bytecode.c (Fbyte_code): Likewise.
3422
3423         * character.h (LEADING_CODE_LATIN_1_MIN)
3424         (LEADING_CODE_LATIN_1_MAX): New macros.
3425         (unibyte_to_multibyte_table): Extern it.
3426         (unibyte_char_to_multibyte): New macro.
3427         (MAKE_CHAR_MULTIBYTE): Use unibyte_to_multibyte_table.
3428         (CHAR_LEADING_CODE): New macro.
3429         (FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE): New macro.
3430
3431         * character.c (unibyte_to_multibyte_table): New variable.
3432         (unibyte_char_to_multibyte): Move to character.h and defined as
3433         macro.
3434         (multibyte_char_to_unibyte): If C is an eight-bit character,
3435         convert it to the corresponding byte value.
3436
3437         * charset.c (Fset_unibyte_charset): If the dimension of CHARSET is
3438         not 1, singals an error.  Update the elements of
3439         unibyte_to_multibyte_table.
3440         (init_charset_once): Initialize unibyte_to_multibyte_table.
3441         (syms_of_charset): Define the charset `iso-8859-1'.
3442
3443         * casefiddle.c (casify_object): Fix previous change.
3444
3445         * cmds.c (internal_self_insert): In a multibyte buffer, insert C
3446         as is without converting it to unibyte.  In a unibyte buffer,
3447         convert C to multibyte before checking the syntax.
3448
3449         * lisp.h (unibyte_char_to_multibyte): Extern deleted.
3450
3451         * minibuf.c (Fminibuffer_complete_word): Use the macro
3452         FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE.
3453
3454         * regex.h (struct re_pattern_buffer): New member target_multibyte.
3455
3456         * regex.c (RE_TARGET_MULTIBYTE_P): New macro.
3457         (GET_CHAR_BEFORE_2): Check target_multibyte, not multibyte.  If
3458         that is zero, convert an eight-bit char to multibyte.
3459         (MAKE_CHAR_MULTIBYTE, CHAR_LEADING_CODE): New dummy new macros for
3460         non-emacs case.
3461         (PATFETCH): Convert an eight-bit char to multibyte.
3462         (HANDLE_UNIBYTE_RANGE): New macro.
3463         (regex_compile): Setup the compiled pattern for multibyte chars
3464         even if the given regex string is unibyte.  Use PATFETCH_RAW
3465         instead of PATFETCH in many places.  To handle `charset'
3466         specification of unibyte, call HANDLE_UNIBYTE_RANGE.   Use bitmap
3467         only for ASCII chars.
3468         (analyse_first) <exactn>: Simplified because the compiled pattern
3469         is multibyte.
3470         <charset_not>: Setup fastmap from bitmap only for ASCII chars.
3471         <charset>: Use CHAR_LEADING_CODE to get leading codes.
3472         <categoryspec>: If multibyte, setup fastmap only for ASCII chars
3473         here.
3474         (re_compile_fastmap) [emacs]: Call analyse_first with the arg
3475         multibyte always 1.
3476         (re_search_2) In emacs, set the locale variable multibyte to 1,
3477         otherwise to 0.  New local variable target_multibyte.  Check it
3478         to decide the multibyteness of STR1 and STR2.  If
3479         target_multibyte is zero, convert unibyte chars to multibyte
3480         before translating and checking fastmap.
3481         (TARGET_CHAR_AND_LENGTH): New macro.
3482         (re_match_2_internal): In emacs, set the locale variable multibyte
3483         to 1, otherwise to 0.  New local variable target_multibyte.  Check
3484         it to decide the multibyteness of STR1 and STR2.  Use
3485         TARGET_CHAR_AND_LENGTH to fetch a character from D.
3486         <charset, charset_not>: If multibyte is nonzero, check fastmap
3487         only for ASCII chars.   Call bcmp_translate with
3488         target_multibyte, not with multibyte.
3489         <begline>: Declare the local variable C as `unsigned'.
3490         (bcmp_translate): Change the last arg name to target_multibyte.
3491
3492         * search.c (compile_pattern_1): Don't adjust the multibyteness of
3493         the regexp pattern and the matching target.  Set cp->buf.multibyte
3494         to the multibyteness of the regexp pattern.  Set
3495         cp->but.target_multibyte to the multibyteness of the matching
3496         target.
3497         (wordify): Use FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE instead of
3498         FETCH_STRING_CHAR_ADVANCE.
3499         (Freplace_match): Convert unibyte chars to multibyte.
3500
3501         * syntax.c (char_quoted): Use FETCH_CHAR_AS_MULTIBYTE to convert
3502         unibyte chars to multibyte.
3503         (back_comment): Likewise.
3504         (scan_words): Likewise.
3505         (skip_chars): The arg syntaxp is deleted, and the code for
3506         handling syntaxes is moved to skip_syntaxes.  Callers changed.
3507         Fix the case that the multibyteness of STRING and the current
3508         buffer doesn't match.
3509         (skip_syntaxes): New function.
3510         (SYNTAX_WITH_MULTIBYTE_CHECK): Check C by ASCII_CHAR_P, not by
3511         SINGLE_BYTE_CHAR_P.
3512         (Fforward_comment): Use FETCH_CHAR_AS_MULTIBYTE to convert unibyte
3513         chars to multibyte.
3514         (scan_lists): Likewise.
3515         (Fbackward_prefix_chars): Likewise.
3516         (scan_sexps_forward): Likewise.
3517
3518 2002-08-23  Kenichi Handa  <handa@m17n.org>
3519
3520         * xfaces.c (QCfontset): New variable.
3521         (LFACE_FONTSET): New macro.
3522         (check_lface_attrs): Check also LFACE_FONTSET_INDEX.
3523         (set_lface_from_font_name): Setup LFACE_FONTSET (lface).
3524         (Finternal_set_lisp_face_attribute): Handle QCfontset.
3525         (Finternal_get_lisp_face_attribute): Likewise.
3526         (lface_same_font_attributes_p): Fix checking of LFACE_FONT_INDEX,
3527         check also LFACE_FONTSET_INDEX.
3528         (face_fontset): Check attrs[LFACE_FONTSET_INDEX], not
3529         attrs[LFACE_FONT_INDEX].
3530         (syms_of_xfaces): Intern and staticpro QCfontset.
3531
3532         * dispextern.h (enum lface_attribute_index): New member
3533         LFACE_FONTSET_INDEX.
3534
3535         * fns.c (base64_encode_1): Handle eight-bit chars correctly.
3536
3537 2002-08-21  Kenichi Handa  <handa@m17n.org>
3538
3539         * coding.c (coding_set_destination): Fix coding->destination for
3540         the case converting a region.
3541         (encode_coding_utf_8): Encode eight-bit chars as single byte.
3542         (encode_coding_object): Fix coding->dst_pos and
3543         coding->dst_pos_byte for the case converting a region.
3544
3545         * insdel.c (insert_from_gap): Make it work even if PT != GTP.
3546
3547         * character.h (BYTE8_STRING): New macro.
3548
3549         * fns.c (base64_decode_1): Insert eight-bit chars correctly.
3550
3551 2002-08-20  Kenichi Handa  <handa@m17n.org>
3552
3553         * xdisp.c (get_next_display_element): Don't display unibyte 8-bit
3554         characters by octal form.
3555
3556         * abbrev.c (Fexpand_abbrev): Fix for the multibyte case.
3557
3558         * buffer.h (_fetch_multibyte_char_len): Extern deleted.
3559         (FETCH_MULTIBYTE_CHAR): Don't use _fetch_multibyte_char_len.
3560         (BUF_FETCH_MULTIBYTE_CHAR): Likewise.
3561         (FETCH_CHAR_AS_MULTIBYTE): New macro.
3562
3563         * casetab.c (set_canon, set_identity, shuffle): Simplified.
3564
3565         * casefiddle.c (casify_object): Simplified.  Handle the case that
3566         the case conversion change the byte length.
3567         (casify_region): Likewise
3568
3569         * character.h (MAKE_CHAR_UNIBYTE, MAKE_CHAR_MULTIBYTE): New
3570         macros.
3571
3572         * character.c (_fetch_multibyte_char_len): This variable deleted.
3573         (syms_of_character): Setup Vprintable_chars.
3574
3575         * editfns.c (Fchar_equal): Fix for the unibyte case.
3576         (Finsert_byte): New function.
3577         (syms_of_editfns): Defsubr it.
3578
3579         * keyboard.c (read_key_sequence): Use ~CHAR_MODIFIER_MASK instead
3580         of direct code 0x3ffff.
3581
3582         * search.c (Freplace_match): Fix for the unibyte case.
3583
3584 2002-08-19  Kenichi Handa  <handa@m17n.org>
3585
3586         * lread.c (safe_to_load_p): Fix the logic.
3587
3588         * syntax.c (scan_words): Don't treat characters belonging to
3589         different scripts as constituting a word.
3590
3591         * editfns.c (Fformat): Use ASCII_CHAR_P, not SINGLE_BYTE_CHAR_P.
3592
3593         * fontset.c (Fset_fontset_font): Treat `ascii' as charset, not
3594         script.
3595
3596         * emacs.c (main): In the case of --unibyte, instead of aborting on
3597         finding non-empty buffer, make it unibyte.
3598
3599 2002-08-18  Kenichi Handa  <handa@m17n.org>
3600
3601         * xterm.c (x_new_fontset): Call `create-fontset-from-ascii-font'
3602         to create a fontset.
3603
3604 2002-08-18  Dave Love  <fx@gnu.org>
3605
3606         * character.c (Funibyte_char_to_multibyte): Doc fix.
3607
3608         * xfns.c [HAVE_STDLIB_H]: Fix last change.
3609
3610 2002-08-15  Kenichi Handa  <handa@m17n.org>
3611
3612         * fontset.c (fontset_add): Make the type `int'.
3613         (fontset_id_valid_p): Define it if FONTSET_DEBUG is defined.
3614
3615         * character.c (unibyte_char_to_multibyte): Refer to
3616         charset_unibyte, not charset_primary.
3617         (multibyte_char_to_unibyte): Likewise.
3618         (Funibyte_char_to_multibyte): Likewise.
3619
3620         * charset.h: (charset_unibyte): Extern it instead of
3621         charset_primary.
3622
3623         * charset.c (charset_unibyte): Renamed from charset_primary.
3624         (Funibyte_charset): Renamed from Fprimary_charset.
3625         (Fset_unibyte_charset): Renamed from Fset_primary_charset.
3626         (syms_of_charset): Adjusted for the above changes.
3627
3628         * w32term.c (x_produce_glyphs): Use ASCII_CHAR_P, not
3629         SINGLE_BYTE_CHAR_P.  Fix the logic of handling non-ASCII char when
3630         it->multibyte_p is zero.
3631
3632         * lisp.h (nonascii_insert_offset, Vnonascii_translation_table):
3633         Extern deleted.
3634
3635 2002-08-08  Kenichi Handa  <handa@m17n.org>
3636
3637         * coding.c (Fdefine_coding_system_internal): Fix category setting
3638         for a coding system of type iso-2022.
3639
3640 2002-08-02  Kenichi Handa  <handa@m17n.org>
3641
3642         * fontset.h (FS_LOAD_FONT): Call fs_load_font with the arg CHARSET
3643         -1.
3644
3645 2002-08-01  Kenichi Handa  <handa@m17n.org>
3646
3647         * syntax.c (Vnext_word_boundary_function_table): New variable.
3648         (syms_of_syntax): Declare it as a Lisp variable.
3649         (scan_words): Call functions in Vnext_word_boundary_function_table
3650         if any.
3651
3652         * xterm.c (x_load_font): Initialize fontp->fontset to -1.
3653
3654         * fontset.c (fs_load_font): If fontp->charset is not negative,
3655         return fontp without setting its members.
3656
3657 2002-07-31  Dave Love  <fx@gnu.org>
3658
3659         * config.in: Generated with autoheader.
3660
3661         * xfns.c [HAVE_STDLIB_H]: Change logic (instead of fixing typo).
3662
3663         * m/sparc.h (HAVE_ALLOCA): Delete.
3664
3665         * s/irix6-5.h: Don't include strings.h.
3666         (bcopy, bzero, bcmp): Don't undef.
3667
3668         * s/irix6-0.h (bcopy, bzero, bcmp): Don't undef.
3669
3670         * s/usg5-4.h (NO_SIOCTL_H): Don't define.
3671         (TIOCSIGSEND): Don't test IRIX6.
3672         (bcopy, bzero, bcmp): Define conditionally.
3673
3674 2002-07-31  Kenichi Handa  <handa@m17n.org>
3675
3676         * buffer.c (Qas, Qmake, Qto): New variables.
3677         (Fset_buffer_multibyte): New optional arg METHOD.  Caller changed.
3678         (syms_of_buffer): Intern and staticpro Qas, Qmake, and Qto.
3679
3680         * callproc.c (Fcall_process): Don't call insert_1_both directly if
3681         we are inserting a process output into a multibyte buffer.
3682
3683         * character.h (CHAR_TO_BYTE8): If C is not eight-bit char, call
3684         multibyte_char_to_unibyte.
3685
3686         * character.c (Funibyte_char_to_multibyte): If C can't be decoded
3687         by the primary charset, make it eight-bit char.
3688         (Fmultibyte_char_to_unibyte): Call CHAR_TO_BYTE8.
3689
3690         * charset.c: (charset_eight_bit, Qeight_bit_control): New
3691         variables.
3692         (charset_8_bit__control, charset_8_bit_graphic,
3693         Qeight_bit_control, Qeight_bit_graphic): These variables deleted.
3694         (define_charset_internal): New function.
3695         (syms_of_charset): Call define_charset_internal for pre-defined
3696         charsets.
3697
3698         * charset.h (charset_8_bit): Extern it.
3699
3700         * coding.c (make_conversion_work_buffer): Adjusted for the change
3701         of Fset_buffer_multibyte.
3702         (encode_coding_raw_text): Increment p0 in the loop.
3703
3704         * lisp.h (Fset_buffer_multibyte): Prototype adjusted.
3705
3706         * xdisp.c (setup_echo_area_for_printing, set_message_1): Adjusted
3707         for the change of Fset_buffer_multibyte.
3708
3709         * fns.c (Fstring_to_multibyte): New function.
3710         (syms_of_fns): Declare Fstring_to_multibyte as Lisp subroutine.
3711
3712 2002-07-30  Dave Love  <fx@gnu.org>
3713
3714         * xfns.c (x_put_x_image): Declare args.
3715
3716         * xfaces.c (font_name_registry, choose_face_font): Delete unused
3717         vars.
3718         (try_font_list): Declare an arg.
3719
3720         * xdisp.c (message2_nolog, set_message): Declare an arg.
3721
3722         * terminfo.c (tparam): Declare an arg.  Use P_ to declare tparm.
3723
3724         * syntax.c (scan_sexps_forward): Declare an arg.
3725
3726         * scroll.c (calculate_scrolling, calculate_direct_scrolling):
3727         Declare an arg.
3728
3729         * lisp.h (Fnew_fontset): Declare.
3730
3731         * keymap.c (push_key_description): Call CHARACTERP correctly.
3732
3733         * fontset.c (fontset_add): Declare args.  Call make_number
3734         correctly.
3735         (face_for_char): Delete unused vars.
3736         (Fset_fontset_font): Doc fix.  Delete unused vars.
3737
3738         * doc.c (Fsubstitute_command_keys): Delete unused vars.
3739
3740         * composite.c (update_compositions): Declare arg.
3741
3742         * cm.c (calccost, cmgoto): Declare args.
3743
3744         * charset.c: Remove `emacs' conditional.  Doc fixes.
3745         (map_char_table_for_charset): Declare.
3746
3747         * character.c (syms_of_character) <translation-table-vector>: Doc
3748         fix.
3749
3750         * ccl.c: Remove `emacs' conditional.  Include hash table stuff
3751         from trunk.
3752
3753 2002-07-26  Kenichi Handa  <handa@m17n.org>
3754
3755         The following changes are to allow specifying multiple font
3756         patterns for a character range (specified by script or charset).
3757
3758         * Makefile.in (abbrev.o): Depend on syntax.h.
3759         (xfaces.o): Depend on charset.h.
3760
3761         * alloc.c (Fmake_string): Use ASCII_CHAR_P, not
3762         SINGLE_BYTE_CHAR_P.
3763
3764         * ccl.c (Fccl_execute_on_string): Add `const' to local variables.
3765
3766         * character.h (Vchar_script_table): Extern it.
3767
3768         * character.c (Vscript_alist): This variable deleted.
3769         (Vchar_script_table, Qchar_script_table): New variable.
3770         (syms_of_character): Declare Vchar_script_table as a lisp variable
3771         and initialize it.
3772
3773         * chartab.c (Fmake_char_table): Doc fixed.  If PURPOSE doesn't
3774         have property char-table-extra-slots, make no extra slot.
3775
3776         * dispextern.h (struct face): Member `charset' deleted.
3777         (FACE_SUITABLE_FOR_CHAR_P): Use ASCII_CHAR_P, not
3778         SINGLE_BYTE_CHAR_P.
3779         (FACE_FOR_CHAR): Likewise.
3780         (choose_face_font, lookup_non_ascii_face, font_name_registry): Add
3781         prototypes
3782         (lookup_face, lookup_named_face, lookup_derived_face): Prototype
3783         fixed.
3784         (generate_ascii_font_name): Renamed from generate_ascii_font.
3785
3786         * fontset.h (get_font_repertory_func): New prototype.
3787         (make_fontset_for_ascii_face, fs_load_font): Prototypes fixed.
3788         (FS_LOAD_FONT): Call fs_load_font with the 3rd arg charset_ascii.
3789
3790         * fontset.c (Qprepend, Qappend): New variables.
3791         (FONTSET_CHARSET_ALIST, FONTSET_FACE_ALIST): These macros deleted.
3792         (FONTSET_NOFONT_FACE, FONTSET_REPERTORY): New macros.
3793         (FONTSET_REF): Optimize if FONTSET is Vdefault_fontset.
3794         (FONTSET_REF_AND_RANGE, FONTSET_ADD): New macros.
3795         (fontset_ref_and_range, fontset_add, reorder_font_vector)
3796         (load_font_get_repertory): New functions.
3797         (fontset_set): This function deleted.
3798         (fontset_face): New arg FACE.  Return face ID, not face.
3799         Completely re-written to handle new fontset structure.  Caller
3800         changed.
3801         (free_face_fontset): Use ASET istead of AREF (X) = Y.
3802         (face_for_char): Don't call lookup_face.
3803         (make_fontset_for_ascii_face): New arg FACE.
3804         (fs_load_font): New arg CHARSET_ID.  Don't check
3805         Vfont_encoding_alist here.
3806         (find_font_encoding): New function.
3807         (list_fontsets): Use STRINGP, not ! NILP.
3808         (accumulate_script_ranges): New function.
3809         (Fset_fontset_font, Fnew_fontset, Ffontset_info): Completely
3810         re-written to handle new fontset structure.
3811         (Ffontset_font): Return a copy of element.
3812         (syms_of_fontset): Define symbols Qprepend and Qappend.  Fix
3813         docstring of font-encoding-alist.
3814
3815         * lisp.h (CHAR_TABLE_REF): Remove unnecessary check (IDX >= 0).
3816         (Fset_fotset_font): Fix arguments to 5.
3817
3818         * msdos.c (XMenuActivate): Adjuted for the change of
3819         lookup_derived_face.
3820
3821         * xdisp.c (message_dolog, set_message_1, extend_face_to_end_of_line):
3822         Use ASCII_CHAR_P, not SINGLE_BYTE_CHAR_P.
3823         (highlight_trailing_whitespace): Adjusted for the change of
3824         lookup_named_face.
3825
3826         * xfaces.c: Include charset.h.
3827         (load_face_font): Argument C deleted.  Caller changed.
3828         (generate_ascii_font_name): Renamed from generate_ascii_font.
3829         (font_name_registry): New function.
3830         (cache_face): Store ascii faces before non-ascii faces in buckets.
3831         (lookup_face): Arguments C and BASE_FACE deleted.  Caller changed.
3832         Lookup only ascii faces.
3833         (lookup_non_ascii_face): New function.
3834         (lookup_named_face): Argument C deleted.  Caller changed.
3835         (lookup_derived_face): Argument C deleted.  Caller changed.
3836         (try_font_list): New arg PATTERN.  Caller changed.  If PATTERN is
3837         a string, just call font_list with it.
3838         (choose_face_font): Arguments FACE and C deleted.  New arg
3839         FONT_SPEC.  Caller changed.
3840         (realize_face): Arguments C and BASE_FACE deleted.  Caller
3841         (realize_x_face): Likewise.
3842         (realize_non_ascii_face): New function.
3843         (realize_x_face): Call load_face_font here.
3844         (realize_tty_face): Argument C deleted.  Caller changed.
3845         (compute_char_face): If CH is not ascii, call FACE_FOR_CHAR to
3846         get a face ID.
3847         (dump_realized_face): Don't print charset of FACE.
3848
3849         * xfns.c (x_set_font): Always call x_new_fontset and
3850         store_frame_parameter.
3851         (Fx_create_frame): Call x_new_fontset, not x_new_font.
3852         (syms_of_xfns): Set get_font_repertory_func to
3853         x_get_font_repertory.
3854
3855         * xterm.h (x_get_font_repertory): Extern it.
3856
3857         * xterm.c (x_produce_glyphs): Use ASCII_CHAR_P, not
3858         SINGLE_BYTE_CHAR_P.  Fix the logic of handling non-ASCII char when
3859         it->multibyte_p is zero.
3860         (XTread_socket): Use ASCII_CHAR_P, not SINGLE_BYTE_CHAR_P.
3861         (x_new_fontset): If FONTSETNAME doesn't match any existing
3862         fontsets, create a new one.
3863         (x_get_font_repertory): New function.
3864
3865 2002-07-25  Kenichi Handa  <handa@m17n.org>
3866
3867         * coding.c (Ffind_coding_systems_region_internal): Detect an
3868         ASCII only string correctly.
3869
3870         * lread.c (Fload): Don't load with Qload_force_doc_strings t if
3871         version is 0.
3872
3873 2002-07-24  Kenichi Handa  <handa@m17n.org>
3874
3875         * lread.c: Include "coding.h".
3876         (Qget_emacs_mule_file_char, Qload_force_doc_strings,
3877         load_each_byte, unread_char): New variables.
3878         (readchar_backlog): This variable deleted.
3879         (readchar): Return a character unless load_each_byte is nonzero.
3880         Handle the case that readcharfun is Qget_emacs_mule_file_char or a
3881         cons.  If unread_char is not -1, simply return it.
3882         (unreadchar): Handle the case that readcharfun is
3883         Qget_emacs_mule_file_char or a cons.  Set unread_char if
3884         necessary.
3885         (read_multibyte): This function deleted.
3886         (readbyte_for_lambda, readbyte_from_file, readbyte_from_string)
3887         (read_emacs_mule_char): New functions.
3888         (Fload): Even if the file doesn't have the extention ".elc", if
3889         safe_to_load_p returns a positive version number, assume that the
3890         file contains bytecompiled code.  If the version is less than 22,
3891         load the file while decoding multibyte sequences by emacs-mule.
3892         (readevalloop): Don't use readchar_backlog.
3893         (Fread): Likewise.  Pay attention to the case that STREAM is a
3894         cons.
3895         (Fread_from_string): Pay attention to the case that STREAM is a
3896         cons.
3897         (read_escape): The arg BYTEREP deleted.
3898         (read1): Set load_each_byte to 1 temporarily while handling
3899         #@NUMBER.  Don't call read_multibyte.
3900         (read_vector): Call Fread with a cons.  If readcharfun is
3901         Qget_emacs_mule_file_char, decode the read string by emacs-mule.
3902         (read_list): If doc_reference is 2, make the cdr part string as
3903         unibyte.
3904         (syms_of_lread): Intern and staticpro Qget_emacs_mule_file_char
3905         and Qload_force_doc_strings.
3906
3907 2002-07-23  Kenichi Handa  <handa@m17n.org>
3908
3909         * xdisp.c (face_before_or_after_it_pos): Call
3910         FETCH_MULTIBYTE_CHAR with byte postion, not char position.
3911
3912 2002-07-22  Kenichi Handa  <handa@m17n.org>
3913
3914         * character.h (TRAILING_CODE_P): New macro.
3915         (MAYBE_UNIFY_CHAR): Adjusted for the change of Funify_charset.
3916         (string_char_with_unification): Fix prototype.
3917         (Vscript_alist): Extern it.
3918
3919         * character.c (Vscript_alist): New variable.
3920         (string_char_with_unification): Add `const' to local variables.
3921         (str_as_unibyte): Likewise.
3922         (string_escape_byte8): Likewise.
3923         (syms_of_character): Declare script-alist as a Lisp variable.
3924
3925         * charset.h (Vcharset_ordered_list): Extern it.
3926         (charset_ordered_list_tick): Extern it.
3927         (EMACS_MULE_LEADING_CODE_PRIVATE_11)
3928         (EMACS_MULE_LEADING_CODE_PRIVATE_12)
3929         (EMACS_MULE_LEADING_CODE_PRIVATE_21)
3930         (EMACS_MULE_LEADING_CODE_PRIVATE_22): New macros
3931         (Funify_charset): Adjusted for the change of Funify_charset.
3932
3933         * charset.c (charset_ordered_list_tick): New variable.
3934         (Fdefine_charset_internal): Increment charset_ordered_list_tick.
3935         (Funify_charset): New optional arg DEUNIFY.  If it is non-nil,
3936         deunify intead of unify a charset.
3937         (string_xstring_p): Add `const' to local variables.
3938         (find_charsets_in_text): Add `const' to arguemnts and local
3939         variables.
3940         (encode_char): Adjusted for the change of Funify_charset.  Fix
3941         detecting of invalid code.
3942         (Fset_charset_priority): Increment charset_ordered_list_tick.
3943         (Fmap_charset_chars): Fix handling of default value for FROM_CODE
3944         and TO_CODE.
3945
3946         * coding.c (LEADING_CODE_PRIVATE_11, LEADING_CODE_PRIVATE_12)
3947         (LEADING_CODE_PRIVATE_21, LEADING_CODE_PRIVATE_22): Macros
3948         deleted.  Callers changed to use
3949         EMACS_MULE_LEADING_CODE_PRIVATE_11, etc.
3950         (decode_coding_ccl): Add `const' to local variables.
3951         (consume_chars): Likewise.
3952         (Ffind_coding_systems_region_internal): Likewise.
3953         (Fcheck_coding_systems_region): Likewise.
3954
3955         * print.c (print_object): Use octal form for printing the
3956         contents of a bool vector.
3957
3958 2002-07-18  Dave Love  <fx@gnu.org>
3959
3960         * lread.c (Fload) <!load_dangerous_libraries>: Don't leak fd.
3961         <version == 20>: Refuse to load.
3962
3963 2002-07-17  Dave Love  <fx@gnu.org>
3964
3965         * fns.c: Move coding.h.
3966         (Qcodeset, Qdays, Qmonths): New.
3967         (concat): Use CHARACTERP instead of INTERGERP.
3968         (Flocale_codeset): Deleted.
3969         (Flanginfo): New function.
3970         (syms_of_fns): Changed accordingly.
3971
3972         * coding.c (adjust_coding_eol_type): Fix eol_type/eol_seen mixup.
3973
3974 2002-07-16  Dave Love  <fx@gnu.org>
3975
3976         * casetab.c (init_casetab_once, init_casetab_once): Fix
3977         CHAR_TABLE_SET call.
3978
3979         * category.c (Fmodify_category_entry): Fix CATEGORY_MEMBER call.
3980
3981         * character.c (syms_of_character): Fix CHAR_TABLE_SET call.
3982
3983         * charset.c (Fmap_charset_chars): Check args.  Convert Lisp types.
3984         (load_charset_map, Fdeclare_equiv_charset, Fencode_char)
3985         (Fset_charset_priority, syms_of_charset): Convert Lisp types.
3986
3987         * charset.h (CHECK_CHARSET_GET_ID): Use XINT on AREF result.
3988
3989         * coding.c (ENCODE_DESIGNATION, decode_eol)
3990         (make_conversion_work_buffer, code_conversion_restore)
3991         (Fdefine_coding_system_internal): Convert Lisp types.
3992         (code_conversion_restore): Use EQ, not ==.
3993         (Fencode_coding_string): Fix code_convert_string call.
3994
3995         * coding.h (code_convert_region): Fix prototype.
3996
3997         * dispextern.h (redraw_frame, redraw_garbaged_frames): Removed.
3998
3999         * fontset.c (fontset_ref, fontset_set, fs_load_font)
4000         (Ffontset_info): Convert Lisp types.
4001
4002         * syntax.h (SYNTAX_ENTRY_INT): Don't use make_number.
4003
4004         * xterm.c (note_mouse_movement): Fix call of window_from_coordinates.
4005
4006         * xdisp.c (display_mode_element): Fix call of Fset_text_properties.
4007
4008         * chartab.c: Include "...h", not <...h> in some cases.
4009
4010         * callproc.c (Fcall_process): Remove unused variables.
4011
4012 2002-07-12  Dave Love  <fx@gnu.org>
4013
4014         * coding.c (Fset_coding_system_priority): Allow null arg list.
4015
4016 2002-07-03  Dave Love  <fx@gnu.org>
4017
4018         * minibuf.c (Fminibuffer_complete_word): Remove unused var.
4019         (Fself_insert_and_exit): Use CHARACTERP.
4020
4021         * callproc.c (Fcall_process): Remove unused vars.
4022
4023         * xterm.c (XTread_socket): Add extra dead keysyms.
4024
4025         * xdisp.c (decode_mode_spec_coding): Use CHARACTERP.
4026
4027         * dispextern.h: Remove prototypes for redraw_frame,
4028         redraw_garbaged_frames.
4029
4030         * cmds.c (Fself_insert_command): Use CHARACTERP.
4031
4032         * chartab.c (make_sub_char_table): Remove unused var.
4033         (Fset_char_table_default, Fmap_char_table): Doc fix.
4034
4035         * keymap.c (access_keymap): Remove generic char code.
4036         (push_key_description): Use CHARACTERP.
4037
4038 2002-07-01  Dave Love  <fx@gnu.org>
4039
4040         * charset.c: Doc fixes.
4041         (Funify_charset): Extra checking.
4042
4043 2002-06-24  Dave Love  <fx@gnu.org>
4044
4045         * lread.c: Remove some unused variables.
4046         (safe_to_load_p): If safe, return the magic number version byte.
4047         (Fload): Maybe use load-with-code-conversion.
4048
4049 2002-06-12  Kenichi Handa  <handa@m17n.org>
4050
4051         * category.c (Fmodify_category_entry): Don't modify the contents
4052         of category_set for characters out of the range.  Avoid
4053         unnecessary modification.
4054
4055         * character.h (MAYBE_UNIFY_CHAR): Adjusted for the change of
4056         Vchar_unify_table.  The default value of the table is now nil.
4057
4058         * character.c (syms_of_character): Setup Vchar_width_table for
4059         eight-bit-control and raw-byte chars.
4060
4061         * charset.h (enum define_charset_arg_index): Delete
4062         charset_arg_parents and add charset_arg_subset and
4063         charset_arg_superset.
4064         (enum charset_attr_index): Delete charset_parents and add
4065         charset_subset and charset_superset.
4066         (enum charset_method): Delete CHARSET_METHOD_INHERIT and add
4067         CHARSET_METHOD_SUBSET and CHARSET_METHOD_SUPERSET.
4068         (CHARSET_ATTR_PARENTS, CHARSET_PARENTS): Macros deleted.
4069         (CHARSET_ATTR_SUBSET, CHARSET_ATTR_SUPERSET, CHARSET_SUBSET)
4070         (CHARSET_SUPERSET): New macros.
4071         (charset_work): Extern it.
4072         (ENCODE_CHAR): Use charset_work.
4073         (CHAR_CHARSET_P): Adjusted for the change of encoder format.
4074         (map_charset_chars): Extern it.
4075
4076         * charset.c (load_charset_map): Set the default value of encoder
4077         and deunifier char-tables to nil.
4078         (map_charset_chars): Argument changed.  Callers changed.  Use
4079         map_char_table_for_charset instead of map_char_table.
4080         (Fmap_charset_chars): New optional args from_code and to_code.
4081         (Fdefine_charset_internal): Adjusted for the change of
4082         `define-charset' (:parents -> :subset or :superset).
4083         (charset_work): New variable.
4084         (encode_char): Adjusted for the change of
4085         Fdefine_charset_internal.
4086         (syms_of_charset): Likewise.
4087         (Ffind_charset_string): Setup the vector `charsets' correctly.
4088
4089         * chartab.c (sub_char_table_ref_and_range): New arg defalt.  Fix
4090         the previous change.
4091         (char_table_ref_and_range): Adjusted for the above change.
4092         (map_sub_char_table_for_charset): New function.
4093         (map_char_table_for_charset): New function.
4094
4095         * keymap.c (describe_vector): Handle a char-table directly here.
4096         (describe_char_table): Deleted.
4097
4098         * lisp.h (map_charset_chars): Deleted.
4099
4100 2002-06-11  Dave Love  <fx@gnu.org>
4101
4102         * fns.c (count_combining): Comment out (unused).
4103         (Flocale_codeset): New.
4104         (syms_of_fns): Defsubr it.
4105
4106         * config.in (HAVE_PTY_H, HAVE_SIZE_T, HAVE_LANGINFO_CODESET): New.
4107         (size_t): Removed.
4108
4109 2002-06-06  Dave Love  <fx@gnu.org>
4110
4111         * Makefile.in (chartab.o): Depend on charset.h
4112
4113 2002-06-03  Kenichi Handa  <handa@m17n.org>
4114
4115         * character.c (syms_of_character): Set the default value of
4116         Vprintable_chars to Qnil.
4117
4118 2002-05-31  Dave Love  <fx@gnu.org>
4119
4120         * Makefile.in (lisp, shortlisp): Change indian.elc to indian.el.
4121
4122 2002-05-31  Kenichi Handa  <handa@m17n.org>
4123
4124         * charset.c (load_charset_map): Handle the case that from < to
4125         correctly.
4126
4127         * coding.c (encode_coding_emacs_mule): Pay attention to raw-8-bit
4128         chars.
4129         (encode_coding_iso_2022): Likewise.
4130         (encode_coding_sjis): Likewise.
4131         (encode_coding_big5): Likewise.
4132         (encode_coding_charset): Likewise.
4133
4134 2002-05-30  Kenichi Handa  <handa@m17n.org>
4135
4136         * Makefile.in (lisp): Change chinese.elc to chinese.el.  They are
4137         not bytecompiled now.
4138         (shortlisp): Likewise.
4139
4140         * charset.c (charset_jisx0201_roman, charset_jisx0208_1978)
4141         (charset_jisx0208): New variables.
4142         (Fdefine_charset_internal): Setup them if appropriate.
4143         (init_charset_once): Initialize them to -1.
4144
4145         * charset.h (charset_jisx0201_roman, charset_jisx0208_1978,
4146         charset_jisx0208): Extern them.
4147
4148         * coding.c (CODING_ISO_FLAG_USE_ROMAN): New macro
4149         (CODING_ISO_FLAG_USE_OLDJIS): New macro.
4150         (CODING_ISO_FLAG_FULL_SUPPORT): Macro definition changed.
4151         (setup_iso_safe_charsets): Fix arguemtns to Fassq.
4152         (DECODE_DESIGNATION): Pay attention to CODING_ISO_FLAG_USE_ROMAN
4153         and CODING_ISO_FLAG_USE_OLDJIS.
4154         (ENCODE_ISO_CHARACTER_DIMENSION1): Likewise.
4155         (ENCODE_ISO_CHARACTER_DIMENSION2): Likewise.
4156         (encode_coding_iso_2022): Change the 1st arg to
4157         ENCODE_ISO_CHARACTER to a variable.
4158
4159 2002-05-29  Kenichi Handa  <handa@m17n.org>
4160
4161         * charset.h (enum define_charset_arg_index): New enums
4162         charset_arg_min_code and charset_arg_max_code.
4163         (struct charset): New member char_index_offset.
4164
4165         * charset.c (CODE_POINT_TO_INDEX): Take charset->char_index_offset
4166         into account.
4167         (INDEX_TO_CODE_POINT): Likewise.
4168         (Fdefine_charset_internal): Handle args[charset_arg_min_code] and
4169         args[charset_arg_max_code].  Setup charset.char_index_offset.
4170         (syms_of_charset): Fix args to Fdefine_charset_internal.
4171
4172 2002-05-27  Dave Love  <fx@gnu.org>
4173
4174         * coding.c (decode_coding_utf_8): Reject overlong sequences.
4175
4176 2002-05-26  Dave Love  <fx@gnu.org>
4177
4178         * coding.c: Doc fixes.
4179         (Fcoding_system_aliases): Fix return value.
4180         (Qmac): Remove (duplicated) definition.
4181
4182 2002-05-25  Dave Love  <fx@gnu.org>
4183
4184         * charset.c (Fcharset_priority_list, Fset_charset_priority): New
4185         functions.
4186
4187         * character.c (Fstring): Doc fix.
4188
4189         * charset.c (Fdefine_charset_alias): Update Vcharset_list.
4190
4191         * fontset.c (Ffontset_info): Doc fix.  Return charset names, not
4192         ids.
4193         (font-encoding-alist): Doc fix.
4194
4195 2002-05-24  Dave Love  <fx@gnu.org>
4196
4197         * term.c (costs_set): Declare static, non-initialized for pcc.
4198         (encode_terminal_code): Remove ensued var.
4199
4200         * keyboard.c (kbd_buffer_store_event): Fix interrupt_signal decl
4201         for K&R.
4202
4203         * xterm.c (xlwmenu_window_p): Fix prototype for K&R.
4204
4205         * coding.c (setup_iso_safe_charsets): Fix arg decl for K&R.
4206         (suffixes): Moved out of make_subsidiaries for K&R.
4207
4208         * charset.c (map_charset_chars): Fix c_function declaration for
4209         K&R.
4210
4211         * lisp.h (DEFUN) [!PROTOTYPES]: Remove spurious `args'.
4212
4213 2002-05-23  Dave Love  <fx@gnu.org>
4214
4215         * data.c (Fchar_or_string_p): Doc fix.  Use CHARACTERP.
4216
4217         * category.c (Fmodify_category_entry): Doc fix.  Remove unused
4218         vars.
4219
4220 2002-05-23  Yong Lu <lyongu@asia-infonet.com>
4221
4222         * charset.c (Fdefine_charset_internal): Fix argument to bzero.
4223
4224         * coding.c (Fdefine_coding_system_internal): Fix previous change.
4225         (decode_coding_charset): Workaround for the bug of GCC 2.96.
4226
4227 2002-05-23  Kenichi Handa  <handa@m17n.org>
4228
4229         * Makefile.in (lisp): Change cyrillic.elc to cyrillic.el,
4230         vietnamese.elc to vietnamese.el.  They are not bytecompiled now.
4231         (shortlisp): Likewise.
4232
4233 2002-05-22  Kenichi Handa  <handa@m17n.org>
4234
4235         * coding.c (decode_coding_charset): Adjusted for the change of
4236         Fdefine_coding_system_internal.
4237         (Fdefine_coding_system_internal): For a coding system of
4238         `charset' type, store a list of charset IDs in
4239         `charset_attr_charset_valids' element of coding attributes.
4240
4241         * charset.c (Fmake_char): Fix previous change.
4242
4243 2002-05-21  Kenichi Handa  <handa@m17n.org>
4244
4245         * coding.c (ONE_MORE_BYTE_NO_CHECK): Increment consumed_chars.
4246         (emacs_mule_char): New arg src.  Delete arg `composition'.  Caller
4247         changed.  Handle 2-byte and 3-byte charsets correctly.
4248         (DECODE_EMACS_MULE_COMPOSITION_RULE_20): Renamed from
4249         DECODE_EMACS_MULE_COMPOSITION_RULE.  Caller changed.
4250         (DECODE_EMACS_MULE_COMPOSITION_RULE_21): New macro.
4251         (DECODE_EMACS_MULE_21_COMPOSITION): Call
4252         DECODE_EMACS_MULE_COMPOSITION_RULE_21.  Produce correct annotation
4253         sequence.
4254         (decode_coding_emacs_mule): Handle composition correctly.  Rewind
4255         `src' and `consumed_chars' correctly before calling
4256         emacs_mule_char.
4257         (DECODE_COMPOSITION_START): Correctly handle the case of altchar
4258         and alt&rule composition.
4259         (decode_coding_iso_2022): Handle composition correctly.
4260         (init_coding_once): Setup emacs_mule_bytes for private charsets.
4261
4262         * charset.c (Fdefine_charset_internal): Fix bug for the case of
4263         re-defining a charset.  If the charset has :emacs-mule-id, setup
4264         emacs_mule_bytes.
4265         (Fmake_char): If CODE1 is nil, use the minimum code of the
4266         charset.
4267
4268 2002-05-20  Kenichi Handa  <handa@m17n.org>
4269
4270         * coding.c (encode_coding_iso_2022): If coding requires safe
4271         encoding, produce a character specified by
4272         CODING_INHIBIT_CHARACTER_SUBSTITUTION.
4273         (encode_coding_sjis): Likewise.
4274         (encode_coding_big5): Likewise.
4275         (encode_coding_charset): Likewise.
4276
4277 2002-05-17  Dave Love  <fx@gnu.org>
4278
4279         * xterm.c (XSetIMValues): Declare.
4280
4281         * process.c: Conditionally include sys/wait.h, pty.h.
4282
4283         * print.c (print_object): Fix print format for 64-bit
4284         systems.
4285
4286         * keyboard.c (modify_event_symbol): Fix print format for 64-bit
4287         systems.
4288
4289         * buffer.c (emacs_strerror): Declare.
4290         (MMAP_ALLOCATED_P, mmap_enlarge, syms_of_buffer): Import changes
4291         from trunk.
4292
4293         * fontset.c (Fclear_face_cache): Declare.
4294         (accumulate_font_info): Commented-out (unused).
4295         (face_for_char, Fset_fontset_font, Ffontset_info): Remove unused
4296         variables.
4297
4298         * character.h (string_escape_byte8): Declare.
4299
4300         * charset.c (load_charset_map, load_charset_map_from_file): Remove
4301         unused vars.
4302         (Fdefine_charset_internal, Fsplit_char, syms_of_charset)
4303         (Fmap_charset_chars): Doc fix.
4304
4305         * coding.c (Vchar_coding_system_table, Qchar_coding_system):
4306         Removed.
4307         (Fset_coding_system_priority, Fset_coding_system_priority)
4308         (Fdefine_coding_system_internal): Doc fix.
4309
4310 2002-05-16  Dave Love  <fx@gnu.org>
4311
4312         * s/osf5-0.h (C_SWITCH_SYSTEM) [!__GNUC__]: Remove -nointrinsics.
4313
4314 2002-05-16  Kenichi Handa  <handa@m17n.org>
4315
4316         * character.c (string_escape_byte8): Make multibyte string with
4317         correct size.
4318
4319         * charset.c (Fmake_char): Delete unnecessary code.
4320
4321 2002-05-14  Kenichi Handa  <handa@m17n.org>
4322
4323         * xfns.c (x_encode_text): Allocate coding.destination here, and
4324         call encode_coding_object with dst_object Qnil.
4325
4326         * buffer.c (Fset_buffer_multibyte): Convert 8-bit bytes to
4327         multibyte form correctly.
4328
4329         * fontset.c (fs_load_font): Check fontp->full_name (not fontname)
4330         against Vfont_encoding_alist.
4331
4332         * coding.c (Fdecode_sjis_char): Fix typo (0x7F->0xFF).  Fix the
4333         handling of charset list.
4334         (encode_coding_iso_2022): Setup coding->safe_charsets in advance.
4335         (decode_coding_object): Move point to coding->dst_pos before
4336         calling post-read-conversion function.
4337         (encode_coding_object): Give correct arguments to
4338         pre-write-conversion.  Ignore the return value of
4339         pre-write-conversion function.  Pay attention to the case that
4340         pre-write-conversion changes the current buffer.  If dst_object is
4341         Qt, even if coding->src_bytes is zero, allocate at least one byte
4342         to coding->destination.
4343
4344         * coding.h (JIS_TO_SJIS): Fix typo (j1->s1, j2->s2).
4345
4346         * charset.c (Fmake_char): Make it more backward compatible.
4347         (Fmap_charset_chars): Fix docstring.
4348
4349 2002-05-13  Dave Love  <fx@gnu.org>
4350
4351         * coding.c: Doc fixes.
4352         (Fdefine_coding_system_alias): Use names, not symbols, in
4353         coding-system-alist.
4354
4355 2002-05-13  Kenichi Handa  <handa@m17n.org>
4356
4357         * fontset.c (free_realized_fontsets): Call Fclear_face_cache instead
4358         of calling free_realized_face.
4359
4360 2002-05-10  Yong Lu <lyongu@asia-infonet.com>
4361
4362         * charset.c (load_charset_map): Fix previous change.
4363         (read_hex): Don't treat SPC as a comment starter.
4364         (decode_char): If CODE_POINT_TO_INDEX retruns -1, always return
4365         -1.
4366         (Fdecode_char): Fix typo.
4367
4368 2002-05-10  Kenichi Handa  <handa@m17n.org>
4369
4370         * charset.h (struct charset): New member `code_space_mask'.
4371
4372         * coding.c (coding_set_source): Delete the local variable
4373         beg_byte.
4374         (encode_coding_charset): Delete the local variable charset.
4375         (Fdefine_coding_system_internal): Likewise.
4376         (Fdefine_coding_system_internal): Setup
4377         attrs[coding_attr_charset_valids] correctly.
4378
4379         * charset.c (CODE_POINT_TO_INDEX): Utilize `code_space_mask'
4380         member to check if CODE is valid or not.
4381         (Fdefine_charset_internal): Initialize `code_space_mask' member.
4382         (encode_char): Before calling CODE_POINT_TO_INDEX, check if CODE
4383         is within the range of charset->min_code and carset->max_code.
4384
4385 2002-05-09  Dave Love  <fx@gnu.org>
4386
4387         * syntax.h (syntax_temp) [!__GNUC__]: Declare.
4388
4389         * dispextern.h (generate_ascii_font): Fix return type.
4390
4391         * xfaces.c (generate_ascii_font): Fix arg declaration.
4392
4393         * coding.c (coding_inherit_eol_type)
4394         (Fset_terminal_coding_system_internal)
4395         (Fset_safe_terminal_coding_system_internal): Fix arg declarations.
4396
4397 2002-05-08  Kenichi Handa  <handa@m17n.org>
4398
4399         * coding.c (decode_coding_charset, encode_coding_charset): Handle
4400         multiple charsets correctly.
4401
4402 2002-05-07  Kenichi Handa  <handa@m17n.org>
4403
4404         * search.c (boyer_moore): Fix handling of mulitbyte character
4405         translation.
4406
4407         * xdisp.c (display_mode_element): When the variable `elt' is
4408         changed, update `this' and `lisp_string'.
4409
4410 2002-05-07  Kenichi Handa  <handa@m17n.org>
4411
4412         * buffer.c (Fset_buffer_multibyte): Fix 8-bit char handling.
4413
4414         * callproc.c (Fcall_process): Be sure to give the current buffer
4415         to decode_coding_c_string.  Update PT and PT_BYTE after the
4416         insertion.
4417
4418         * charset.c (struct charset_map_entries): New struct.
4419         (load_charset_map): Renamed from parse_charset_map.  New args
4420         entries and n_entries.  Caller changed.
4421         (load_charset_map_from_file): Renamed from load_charset_map.
4422         Caller changed.  New arg control_flag.  Call load_charset_map at
4423         the tail.
4424         (load_charset_map_from_vector): New function.
4425         (Fdefine_charset_internal): Setup charset.compact_codes_p.
4426         (encode_char): If the charset is compact, change a character index
4427         to a code point.
4428
4429         * coding.c (coding_alloc_by_making_gap): Check the case that the
4430         source and destination are the same correctly.
4431         (decode_coding_raw_text): Set coding->consumed_char and
4432         coding->consumed to 0.
4433         (produce_chars): If coding->chars_at_source is nonzero, update
4434         coding->consumed_char and coding->consumed before calling
4435         alloc_destination.
4436         (Fdefine_coding_system_alias): Register ALIAS in
4437         Vcoding_system_alist.
4438         (syms_of_coding): Define `no-convesion' coding system at the tail.
4439
4440         * fileio.c (Finsert_file_contents): Set coding_system instead of
4441         val.  If the current buffer is multibyte, always call
4442         decode_coding_gap.
4443
4444         * xfaces.c (try_font_list): Give higher priority to fontset's
4445         family than face's family.
4446
4447 2002-04-18  Kenichi Handa  <handa@m17n.org>
4448
4449         * callproc.c (Fcall_process): Be sure to give the current buffer
4450         to decode_coding_c_string.
4451
4452         * xfaces.c (try_font_list): Give a family specified in a fontset
4453         higher priority than a family specified in a face.
4454
4455 2002-04-09  Kenichi Handa  <handa@m17n.org>
4456
4457         * fileio.c (Finsert_file_contents): Fix calculation of `inserted'.
4458         Fix arguments to insert_from_buffer.
4459
4460         * xdisp.c (display_mode_element): Fix calculation of `bytepos'.
4461
4462 2002-03-11  Kenichi Handa  <handa@m17n.org>
4463
4464         * coding.c (produce_chars): Set the variable `multibytep' correctly.
4465         (decode_coding_gap): Set coding->dst_multibyte correctly.
4466
4467 2002-03-07  Kenichi Handa  <handa@m17n.org>
4468
4469         * coding.c (encode_coding_utf_8): Initialize produced_chars to 0.
4470         (decode_coding_utf_16): Fix converting high and low bytes to
4471         code-point.
4472         (encode_coding_utf_16): Substitute coding->default_char for
4473         non-Unicode characters.
4474         (decode_coding): Don't call record_insert here.
4475         (setup_coding_system): Initialize `surrogate' of
4476         coding->spec.utf_16 to 0.
4477         (EMIT_ONE_BYTE): Fix for multibyte case.
4478
4479         * insdel.c (insert_from_gap): Call record_insert.
4480
4481 2002-03-04  Kenichi Handa  <handa@m17n.org>
4482
4483         * casefiddle.c (casify_region): Fix multibyte case.
4484
4485         * character.c (c_string_width): Add return type `int'.
4486         (char_string_with_unification): Arg ADVANCED deleted.
4487
4488         * character.h (CHAR_VALID_P): Don't call CHARACTERP.
4489         (CHAR_STRING): Adjusted for the change of
4490         char_string_with_unification.
4491         (CHAR_STRING_ADVANCE): Make it do-while statement.
4492
4493         * chartab.c (sub_char_table_set_range): Optimized for the case
4494         DEPTH == 3.  Add workaround code for a GCC optimization bug.
4495
4496         * charset.c (parse_charset_map): Remove an unused variable.
4497
4498         * coding.c: Delete unused variables.
4499
4500         * fileio.c (Finsert_file_contents): Set coding_system to Qnil
4501         earlier.  If inserted is zero and the coding system doesn't
4502         require flushing, don't call decode_coding_gap.
4503
4504         * syntax.h (SET_RAW_SYNTAX_ENTRY): Don't call make_number.
4505
4506 2002-03-01  Kenichi Handa  <handa@m17n.org>
4507
4508         The following changes are for using Unicode as an internal
4509         character model, and use UTF-8 format for buffer/string
4510         representation.
4511
4512         * .gdbinit (xchartable): Adjusted for the change of char table
4513         structure.
4514         (xsubchartable, xcoding, xcharset, xcurbuf): New commands.
4515
4516         * Makefile.in (obj): Add character.o and chartab.o.
4517         (lisp, shortlisp): Remove utf-8.elc:
4518         (*.o): For many files, change dependency on charset.h to
4519         character.h, and add dependency on character.h.
4520         (character.o, chartab.o): New targets.
4521
4522         * abbrev.c, bytecode.c, casefiddle.c, cmds.c, dispnew.c, doc.c,
4523         doprnt.c, dosfns.c, frame.c, marker.c, minibuf.c, msdos.c,
4524         w16select.c, w32bdf.c, w32console.c: Include "character.h" instead
4525         of "charset.h".
4526
4527         * dired.c, filelock.c: Include "character.h".
4528
4529         * alloc.c: Include "character.h" instead of "charset.h".
4530         (Fmake_char_table): Moved to chartab.c.
4531         (make_sub_char_table): Likewise.
4532         (syms_of_alloc): Remove defsubr for Smake_char_table.
4533
4534         * buffer.c: Include "character.h" instead of "charset.h", don't
4535         include "coding.h".
4536         (Fset_buffer_multibyte): Adjuted for UTF-8.
4537
4538         * buffer.h: EXFUN Fbuffer_live_p.
4539
4540         * callproc.c: Include "character.h" instead of "charset.h".
4541         (Fcall_process): Big change for the new code-conversion APIs.
4542
4543         * casetab.c: Include "character.h" instead of "charset.h".
4544         (set_canon, set_identity, shuffle): Adjusted for the new
4545         map_char_table spec.
4546         (init_casetab_once): Call CHAR_TABLE_SET instead of directly
4547         accessing the char table structure.
4548
4549         * chartab.c: New file that implements char table.
4550
4551         * category.c: Include "character.h".
4552         (copy_category_entry): New function.
4553         (copy_category_table): Call map_char_table and copy_category_entry.
4554         (Fmake_category_table): Initialize all top-vel slots.
4555         (char_category_set): New function.
4556         (modify_lower_category_set): Deleted.
4557         (Fmodify_category_entry): Call char_table_ref_and_range.
4558
4559         * category.h (CATEGORY_SET): Just call char_category_set.
4560
4561         * ccl.c: Include "character.h".
4562         (Qccl, Qcclp): New variables.
4563         (CCL_WRITE_CHAR): Alway treat the arg CH as a character even if
4564         it's less than 256.
4565         (CCL_WRITE_MULTIBYTE_CHAR): Deleted.
4566         (CCL_WRITE_STRING, CCL_READ_CHAR): Adjusted for the change of SRC
4567         and DST type.
4568         (ccl_driver): Types of arguments changed.  Code adjusted for that.
4569         (Fccl_execute, Fccl_execute_on_string): Adjusted for the change of
4570         ccl_driver.
4571         (syms_of_ccl): Intern and staticpro Qccl and Qcclp.
4572
4573         * ccl.h (struct ccl_program): Members eol_type and multibyte
4574         deleted.  New members src_multibyte, dst_multibyte, consumed, and
4575         produced.
4576         (struct ccl_spec): Members decoder and encoder deleted.  New
4577         memeber ccl.
4578         (CODING_SPEC_CCL_PROGRAM): New macro.
4579         (ccl_driver): Prototype updated.
4580         (Qccl, Qcclp, Fccl_program_p): Extern them.
4581         (CHECK_CCL_PROGRAM): New macro.
4582
4583         * character.c, character.h, chartab.c: New files.
4584
4585         * charset.c: Mostly re-written.  Character and multibyte sequence
4586         handling codes are moved to character.c.
4587
4588         * charset.h: Mostly re-written.  Character and multibyte sequence
4589         handling codes are moved to character.h.
4590
4591         * coding.c, coding.h: Mostly re-written.
4592
4593         * composite.c: Include "character.h" instead of "charset.h".
4594         (CHAR_WIDTH): Moved to character.h.
4595         (HASH_KEY, HASH_VALUE): Deleted.
4596
4597         * composite.h (enum composition_method): Order of enumeration
4598         symbols changed.
4599
4600         * data.c: Include "character.h" instead of "charset.h".
4601         (Faref): Call CHAR_TABLE_REF for a char table.
4602         (Faset): Call CHAR_TABLE_SET for a char table.
4603
4604         * dispextern.h (free_realized_face, check_face_attribytes,
4605         generate_ascii_font): Extern them.
4606         (free_realized_multibyte_face): Extern deleted.
4607
4608         * disptab.h (DISP_CHAR_VECTOR): Adjusted for the change of char
4609         table structure.
4610
4611         * editfns.c: Include "character.h" instead of "charset.h".
4612         (Fchar_to_string): Always call CHAR_STRING.
4613
4614         * emacs.c (main): Call init_charset_once, init_charset,
4615         syms_of_chartab, and syms_of_character.
4616
4617         * fileio.c: Include "character.h" instead of "charset.h".
4618         (Finsert_file_contents): Big change for the new code-conversion
4619         API.
4620         (choose_write_coding_system): Likewise.
4621         (Fwrite_region): Likewise.
4622         (build_annotations_2): Deleted.
4623         (e_write): Big change for the new code-conversion API.
4624
4625         * fns.c: Include "character.h" instead of "charset.h".
4626         (copy_sub_char_table): Moved to chartab.c.
4627         (Fcopy_sequence): Call copy_char_table for a char table.
4628         (concat): Delete codes calling count_multibyte.
4629         (string_char_to_byte): Adjusted for the new multibyte form.
4630         (string_byte_to_char): Likewise.
4631         (internal_equal): Adjusted for the change of char table structure.
4632         (Fchar_table_subtype, Fchar_table_parent, Fset_char_table_parent,
4633         Fchar_table_extra_slot, Fset_char_table_extra_slot,
4634         Fchar_table_range, Fset_char_table_range, Fset_char_table_default,
4635         char_table_translate, optimize_sub_char_table,
4636         Foptimize_char_table, map_char_table, Fmap_char_table): Moved to
4637         chartab.c.
4638         (char_table_ref_and_index): Deleted.
4639         (HASH_KEY, HASH_VALUE): Moved to lisp.h.
4640         (Fmd5): Call preferred_coding_system instead of accessing
4641         Vcoding_category_list.  Adjusted for the new code-conversion API.
4642         (syms_of_fns): Defsubr for char table related functions moved to
4643         chartab.c.
4644
4645         * fontset.c: Mostly re-written.
4646
4647         * fontset.h (struct font_info): Type of the member encoding_type
4648         changed.
4649         (enum FONT_SPEC_INDEX): New enum.
4650         (fontset_font_pattern, fs_load_font): Prototype updated.
4651         (FS_LOAD_FONT): Adjusted for the change of fs_load_font.
4652
4653         * indent.c: Include "character.h" instead of "charset.h".
4654         (MULTIBYTE_BYTES_WIDTH): Call CHAR_WIDTH instead of
4655         WIDTH_BY_CHAR_HEAD.
4656
4657         * insdel.c: Include "character.h" instead of "charset.h".
4658         (copy_text): Don't refer to Vnonascii_translation_table.
4659         (insert_from_gap): New function.
4660
4661         * keyboard.c: Include "character.h" instead of "charset.h".
4662         (command_loop_1): Never call direct_output_forward_char before
4663         a non-ASCII character.
4664         (read_char): If Vkeyboard_translate_table is a char table, always
4665         translated a character.
4666
4667         * keymap.c: Include "character.h".
4668         (store_in_keymap): Handle the case that IDX is a cons.
4669         (Fdefine_key): Handle the case that KEY is a cons and the car part
4670         is also a cons (range).
4671         (push_key_description): Adjusted for the new character code.
4672         (describe_vector): Call describe_char_table for a char table.
4673         (describe_char_table): New function.
4674
4675         * keymap.h (describe_char_table): Extern it.
4676
4677         * lisp.h (enum pvec_type): New member PVEC_SUB_CHAR_TABLE.
4678         (XSUB_CHAR_TABLE, XSETSUB_CHAR_TABLE): New macros.
4679         (CHAR_TABLE_ORDINARY_SLOTS, CHAR_TABLE_SINGLE_BYTE_SLOTS,
4680         SUB_CHAR_TABLE_ORDINARY_SLOTS, SUB_CHAR_TABLE_STANDARD_SLOTS):
4681         Deleted.
4682         (CHAR_TABLE_REF, CHAR_TABLE_SET): Adjusted for the new char table
4683         structure.
4684         (CHAR_TABLE_TRANSLATE): Just call char_table_translate.
4685         (CHARTAB_SIZE_BITS_0, CHARTAB_SIZE_BITS_1, CHARTAB_SIZE_BITS_2,
4686         CHARTAB_SIZE_BITS_3): New macros.
4687         (chartab_size): Extern it.
4688         (struct Lisp_Char_Table): Re-designed.
4689         (struct Lisp_Sub_Char_Table): New structure.
4690         (HASH_KEY, HASH_VALUE): Moved from fns.c.
4691         (CHARACTERBITS): Defined as 22.
4692         (GLYPH_MASK_FACE, GLYPH_MASK_CHAR): Adjusted for the above change.
4693         (SUB_CHAR_TABLE_P): Check PVEC_CHAR_TABLE.
4694         (GC_SUB_CHAR_TABLE_P): New macro.
4695         (Fencode_coding_string, Fdecode_coding_string): EXFUN Updated.
4696         (code_convert_string_norecord): Extern deleted.
4697         (init_character_once, syms_of_character, init_charset,
4698         syms_of_composite, Qeq, Fmakehash, insert_from_gap): Extern them.
4699
4700         * lread.c: Include "character.h".
4701         (read_multibyte): New arg NBYTES.
4702         (read_escape): The meaning of returned *BYTEREP changed.
4703         (to_multibyte): Deleted.
4704         (read1): Adjuted the handling of char table and string.
4705
4706         * print.c: Include "character.h" instead of "charset.h".
4707         (print_string): Convert 8-bit raw bytes to octal form by
4708         string_escape_byte8.
4709         (print_object): Adjusted for the new multibyte form.  Print 8-bit
4710         raw bytes always in octal form.  Handle sub char table correctly.
4711
4712         * process.c: Include "character.h" instead of "charset.h".
4713         (read_process_output): Adjusted for the new code-conversion API.
4714         (send_process): Likewise.
4715
4716         * puresize.h (BASE_PURESIZE): Increased.
4717
4718         * regex.c: Include "character.h" instead of "charset.h".
4719         (BYTE8_TO_CHAR, CHAR_BYTE8_P) [not emacs]: New dummy macros.
4720         (regex_compile): Accept a range whose starting and ending
4721         character have different leading bytes.
4722         (analyse_first): Adjusted for the above change.
4723
4724         * search.c: Include "character.h" instead of "charset.h".
4725         (search_buffer, boyer_moore): Adjusted for the new multibyte form.
4726         (Freplace_match): Adjusted for the change of
4727         multibyte_char_to_unibyte.
4728
4729         * syntax.c: Include "character.h" instead of "charset.h".
4730         (syntax_parent_lookup): Deleted.
4731         (Fmodify_syntax_entry): Accept a cons as CHAR.
4732         (skip_chars): Adjusted for the new multibyte form.
4733         (init_syntax_once): Call char_table_set_range instead of directly
4734         accessing the structure of a char table.
4735
4736         * syntax.h (SET_RAW_SYNTAX_ENTRY): Call CHAR_TABLE_SET.
4737         (SYNTAX_ENTRY_FOLLOW_PARENT): Macro deleted.
4738         (SET_RAW_SYNTAX_ENTRY_RANGE): New macro.
4739         (SYNTAX_ENTRY_INT): Call CHAR_TABLE_REF.
4740
4741         * term.c: Include "buffer.h" and "character.h".
4742         (encode_terminal_code): Adjusted for the new code-conversion API.
4743         (write_glyphs): Likewise.
4744         (produce_glyphs): Call CHAR_WIDTH instead of CHARSET_WIDTH.
4745
4746         * w32term.c (x_new_font): Adjusted for the change of FS_LOAD_FONT.
4747
4748         * xdisp.c: Include "character.h".
4749         (get_next_display_element): Adjusted for the new multibyte form.
4750         (disp_char_vector): Adjusted for the new char table structure.
4751         (decode_mode_spec_coding): Adjusted for the new structure of
4752         coding system.
4753         (decode_mode_spec): Adjusted for the new code-conversion API.
4754
4755         * xfaces.c: Include "character.h" instead of "charset.h".
4756         (load_face_font): Adjusted for the change of choose_face_font and
4757         FS_LOAD_FONT.
4758         (generate_ascii_font): New function.
4759         (set_lface_from_font_name): Adjusted for the change of
4760         FS_LOAD_FONT.
4761         (set_font_frame_param): Adjusted for the change of
4762         choose_face_font.
4763         (free_realized_face): Make it public.
4764         (free_realized_faces_for_fontset): Renamed from
4765         free_realized_multibyte_face.  Free also faces realized for ASCII.
4766         (choose_face_font): Argments changed.  Adjusted for the change of
4767         fontset_font_pattern and FS_LOAD_FONT.
4768
4769         * xfns.c: Include "character.h".
4770         (x_encode_text): Adjusted for the new code-conversion API.
4771
4772         * xselect.c: Don't include "charset.h".
4773         (selection_data_to_lisp_data): Adjusted for the new code
4774         covnersion API.
4775
4776         * xterm.c: Include "character.h".
4777         (x_encode_char): New argument CHARSET.  Caller changed.
4778         (x_get_char_face_and_encoding): Call ENCODE_CHAR instead of
4779         SPLIT_CHAR.
4780         (x_get_glyph_face_and_encoding): Likewise.
4781         (x_produce_glyphs): Don't check Vnonascii_translation_table Call
4782         CHAR_WIDTH instead of CHARSET_WIDTH.
4783         (XTread_socket): Adjusted for the new code-conversion API.
4784         (x_new_font): Adjusted for the change of FS_LOAD_FONT.
4785         (x_load_font): Adjusted for the change of struct font.
4786
4787 ;; Local Variables:
4788 ;; coding: iso-2022-7bit
4789 ;; End:
4790
4791     Copyright (C) 2002 Free Software Foundation, Inc.
4792   Copying and distribution of this file, with or without modification,
4793   are permitted provided the copyright notice and this notice are preserved.
4794
4795 ;;; arch-tag: 1bff38bd-2030-46ae-9d18-f15e6006b665