Mercurial > hg > xemacs-beta
comparison src/chartab.c @ 793:e38acbeb1cae
[xemacs-hg @ 2002-03-29 04:46:17 by ben]
lots o' fixes
etc/ChangeLog: New file.
Separated out all entries for etc/ into their own ChangeLog.
Includes entries for the following files:
etc/BABYL, etc/BETA, etc/CHARSETS, etc/DISTRIB, etc/Emacs.ad,
etc/FTP, etc/GNUS-NEWS, etc/GOATS, etc/HELLO, etc/INSTALL,
etc/MACHINES, etc/MAILINGLISTS, etc/MSDOS, etc/MYTHOLOGY, etc/NEWS,
etc/OXYMORONS, etc/PACKAGES, etc/README, etc/TUTORIAL,
etc/TUTORIAL.de, etc/TUTORIAL.ja, etc/TUTORIAL.ko, etc/TUTORIAL.se,
etc/aliases.ksh, etc/altrasoft-logo.xpm, etc/check_cygwin_setup.sh,
etc/custom/example-themes/europe-theme.el,
etc/custom/example-themes/ex-custom-file,
etc/custom/example-themes/example-theme.el, etc/e/eterm.ti,
etc/edt-user.doc, etc/enriched.doc, etc/etags.1, etc/gnuserv.1,
etc/gnuserv.README, etc/package-index.LATEST.gpg,
etc/package-index.LATEST.pgp, etc/photos/jan.png, etc/recycle.xpm,
etc/refcard.tex, etc/sample.Xdefaults, etc/sample.emacs,
etc/sgml/CATALOG, etc/sgml/HTML32.dtd, etc/skk/SKK.tut.E,
etc/smilies/Face_ase.xbm, etc/smilies/Face_ase2.xbm,
etc/smilies/Face_ase3.xbm, etc/smilies/Face_smile.xbm,
etc/smilies/Face_weep.xbm, etc/sounds, etc/toolbar,
etc/toolbar/workshop-cap-up.xpm, etc/xemacs-ja.1, etc/xemacs.1,
etc/yow.lines, etc\BETA, etc\NEWS, etc\README, etc\TUTORIAL,
etc\TUTORIAL.de, etc\check_cygwin_setup.sh, etc\sample.init.el,
etc\unicode\README, etc\unicode\mule-ucs\*, etc\unicode\other\*
unicode/unicode-consortium/8859-16.TXT: New file.
mule/english.el: Define this charset now, since a bug was fixed that formerly
prevented it.
mule/ethio-util.el: Fix compile errors involving Unicode `characters', which should be
integers.
Makefile.in.in: Always include gui.c, to fix compile error when TTY-only.
EmacsFrame.c, abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, bytecode.h, callint.c, callproc.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.c, console-msw.h, console-tty.c, console-x.c, console-x.h, console.c, console.h, data.c, database.c, device-gtk.c, device-msw.c, device-x.c, device.c, device.h, dialog-msw.c, doc.c, doprnt.c, dumper.c, dynarr.c, editfns.c, eldap.c, eldap.h, elhash.c, elhash.h, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, events.h, extents.c, extents.h, faces.c, faces.h, file-coding.c, file-coding.h, fileio.c, filelock.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, free-hook.c, general-slots.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gtk-xemacs.c, gui-msw.c, gui-x.c, gui-x.h, gui.c, gui.h, gutter.c, gutter.h, indent.c, input-method-xlib.c, insdel.c, keymap.c, keymap.h, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-canna.c, mule-ccl.c, mule-charset.c, mule-wnnfns.c, native-gtk-toolbar.c, objects-msw.c, objects-tty.c, objects-x.c, objects.c, objects.h, opaque.c, opaque.h, postgresql.c, postgresql.h, print.c, process-unix.c, process.c, process.h, rangetab.c, rangetab.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, search.c, select-gtk.c, select-x.c, sound.c, specifier.c, specifier.h, strftime.c, symbols.c, symeval.h, syntax.h, text.c, text.h, toolbar-common.c, toolbar-msw.c, toolbar.c, toolbar.h, tooltalk.c, tooltalk.h, ui-gtk.c, ui-gtk.h, undo.c, vm-limit.c, window.c, window.h: Eliminate XSETFOO. Replace all usages with wrap_foo().
Make symbol->name a Lisp_Object, not Lisp_String *. Eliminate
nearly all uses of Lisp_String * in favor of Lisp_Object, and
correct macros so most of them favor Lisp_Object.
Create new error-behavior ERROR_ME_DEBUG_WARN -- output warnings,
but at level `debug' (usually ignored). Use it when instantiating
specifiers, so problems can be debugged. Move
log-warning-minimum-level into C so that we can optimize
ERROR_ME_DEBUG_WARN.
Fix warning levels consistent with new definitions.
Add default_ and parent fields to char table; not yet implemented.
New fun Dynarr_verify(); use for further error checking on Dynarrs.
Rearrange code at top of lisp.h in conjunction with dynarr changes.
Fix eifree(). Use Eistrings in various places
(format_event_object(), where_is_to_char(), and callers thereof)
to avoid fixed-size strings buffers. New fun write_eistring().
Reindent and fix GPM code to follow standards.
Set default MS Windows font to Lucida Console (same size as
Courier New but less interline spacing, so more lines fit).
Increase default frame size on Windows to 50 lines. (If that's too
big for the workspace, the frame will be shrunk as necessary.)
Fix problem with text files with no newlines (). (Change
`convert-eol' coding system to use `nil' for autodetect,
consistent with make-coding-system.)
Correct compile warnings in vm-limit.c.
Fix handling of reverse-direction charsets to avoid errors when
opening (e.g.) mule-ucs/lisp/reldata/uiso8859-6.el.
Recode some object printing methods to use write_fmt_string()
instead of a fixed buffer and sprintf.
Turn on display of png comments as warnings (level `info'), now
that they're unobtrusive.
Revamped the sound documentation.
Fixed bug in redisplay w.r.t. hscroll/truncation/continuation
glyphs causing jumping up and down of the lines, since they're
bigger than the line size. (It was seen most obviously when
there's a horizontal scroll bar, e.g. do C-h a glyph or something
like that.) The problem was that the glyph-contrib-p setting on
glyphs was ignored even if it was set properly, which it wasn't
until now.
author | ben |
---|---|
date | Fri, 29 Mar 2002 04:49:13 +0000 |
parents | 026c5bf9c134 |
children | a5954632b187 |
comparison
equal
deleted
inserted
replaced
792:4e83fdb13eb9 | 793:e38acbeb1cae |
---|---|
152 mark_object (ct->ascii[i]); | 152 mark_object (ct->ascii[i]); |
153 #ifdef MULE | 153 #ifdef MULE |
154 for (i = 0; i < NUM_LEADING_BYTES; i++) | 154 for (i = 0; i < NUM_LEADING_BYTES; i++) |
155 mark_object (ct->level1[i]); | 155 mark_object (ct->level1[i]); |
156 #endif | 156 #endif |
157 mark_object (ct->parent); | |
158 mark_object (ct->default_); | |
157 return ct->mirror_table; | 159 return ct->mirror_table; |
158 } | 160 } |
159 | 161 |
160 /* WARNING: All functions of this nature need to be written extremely | 162 /* WARNING: All functions of this nature need to be written extremely |
161 carefully to avoid crashes during GC. Cf. prune_specifiers() | 163 carefully to avoid crashes during GC. Cf. prune_specifiers() |
318 | 320 |
319 static void | 321 static void |
320 print_char_table (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) | 322 print_char_table (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) |
321 { | 323 { |
322 Lisp_Char_Table *ct = XCHAR_TABLE (obj); | 324 Lisp_Char_Table *ct = XCHAR_TABLE (obj); |
323 char buf[200]; | 325 |
324 | 326 write_fmt_string_lisp (printcharfun, "#s(char-table type %s data (", |
325 sprintf (buf, "#s(char-table type %s data (", | 327 1, char_table_type_to_symbol (ct->type)); |
326 string_data (symbol_name (XSYMBOL | |
327 (char_table_type_to_symbol (ct->type))))); | |
328 write_c_string (buf, printcharfun); | |
329 | 328 |
330 /* Now write out the ASCII/Control-1 stuff. */ | 329 /* Now write out the ASCII/Control-1 stuff. */ |
331 { | 330 { |
332 int i; | 331 int i; |
333 int first = -1; | 332 int first = -1; |
429 static const struct lrecord_description char_table_description[] = { | 428 static const struct lrecord_description char_table_description[] = { |
430 { XD_LISP_OBJECT_ARRAY, offsetof (Lisp_Char_Table, ascii), NUM_ASCII_CHARS }, | 429 { XD_LISP_OBJECT_ARRAY, offsetof (Lisp_Char_Table, ascii), NUM_ASCII_CHARS }, |
431 #ifdef MULE | 430 #ifdef MULE |
432 { XD_LISP_OBJECT_ARRAY, offsetof (Lisp_Char_Table, level1), NUM_LEADING_BYTES }, | 431 { XD_LISP_OBJECT_ARRAY, offsetof (Lisp_Char_Table, level1), NUM_LEADING_BYTES }, |
433 #endif | 432 #endif |
433 { XD_LISP_OBJECT, offsetof (Lisp_Char_Table, parent) }, | |
434 { XD_LISP_OBJECT, offsetof (Lisp_Char_Table, default_) }, | |
434 { XD_LISP_OBJECT, offsetof (Lisp_Char_Table, mirror_table) }, | 435 { XD_LISP_OBJECT, offsetof (Lisp_Char_Table, mirror_table) }, |
435 { XD_LO_LINK, offsetof (Lisp_Char_Table, next_table) }, | 436 { XD_LO_LINK, offsetof (Lisp_Char_Table, next_table) }, |
436 { XD_END } | 437 { XD_END } |
437 }; | 438 }; |
438 | 439 |
612 make_int (Spunct)); | 613 make_int (Spunct)); |
613 } | 614 } |
614 else | 615 else |
615 ct->mirror_table = Qnil; | 616 ct->mirror_table = Qnil; |
616 ct->next_table = Qnil; | 617 ct->next_table = Qnil; |
617 XSETCHAR_TABLE (obj, ct); | 618 ct->parent = Qnil; |
619 ct->default_ = Qnil; | |
620 obj = wrap_char_table (ct); | |
618 if (ty == CHAR_TABLE_TYPE_SYNTAX) | 621 if (ty == CHAR_TABLE_TYPE_SYNTAX) |
619 { | 622 { |
620 ct->next_table = Vall_syntax_tables; | 623 ct->next_table = Vall_syntax_tables; |
621 Vall_syntax_tables = obj; | 624 Vall_syntax_tables = obj; |
622 } | 625 } |
627 #ifdef MULE | 630 #ifdef MULE |
628 | 631 |
629 static Lisp_Object | 632 static Lisp_Object |
630 make_char_table_entry (Lisp_Object initval) | 633 make_char_table_entry (Lisp_Object initval) |
631 { | 634 { |
632 Lisp_Object obj; | |
633 int i; | 635 int i; |
634 Lisp_Char_Table_Entry *cte = | 636 Lisp_Char_Table_Entry *cte = |
635 alloc_lcrecord_type (Lisp_Char_Table_Entry, &lrecord_char_table_entry); | 637 alloc_lcrecord_type (Lisp_Char_Table_Entry, &lrecord_char_table_entry); |
636 | 638 |
637 for (i = 0; i < 96; i++) | 639 for (i = 0; i < 96; i++) |
638 cte->level2[i] = initval; | 640 cte->level2[i] = initval; |
639 | 641 |
640 XSETCHAR_TABLE_ENTRY (obj, cte); | 642 return wrap_char_table_entry (cte); |
641 return obj; | |
642 } | 643 } |
643 | 644 |
644 static Lisp_Object | 645 static Lisp_Object |
645 copy_char_table_entry (Lisp_Object entry) | 646 copy_char_table_entry (Lisp_Object entry) |
646 { | 647 { |
647 Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (entry); | 648 Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (entry); |
648 Lisp_Object obj; | |
649 int i; | 649 int i; |
650 Lisp_Char_Table_Entry *ctenew = | 650 Lisp_Char_Table_Entry *ctenew = |
651 alloc_lcrecord_type (Lisp_Char_Table_Entry, &lrecord_char_table_entry); | 651 alloc_lcrecord_type (Lisp_Char_Table_Entry, &lrecord_char_table_entry); |
652 | 652 |
653 for (i = 0; i < 96; i++) | 653 for (i = 0; i < 96; i++) |
657 ctenew->level2[i] = copy_char_table_entry (new); | 657 ctenew->level2[i] = copy_char_table_entry (new); |
658 else | 658 else |
659 ctenew->level2[i] = new; | 659 ctenew->level2[i] = new; |
660 } | 660 } |
661 | 661 |
662 XSETCHAR_TABLE_ENTRY (obj, ctenew); | 662 return wrap_char_table_entry (ctenew); |
663 return obj; | |
664 } | 663 } |
665 | 664 |
666 #endif /* MULE */ | 665 #endif /* MULE */ |
667 | 666 |
668 DEFUN ("copy-char-table", Fcopy_char_table, 1, 1, 0, /* | 667 DEFUN ("copy-char-table", Fcopy_char_table, 1, 1, 0, /* |
678 | 677 |
679 CHECK_CHAR_TABLE (char_table); | 678 CHECK_CHAR_TABLE (char_table); |
680 ct = XCHAR_TABLE (char_table); | 679 ct = XCHAR_TABLE (char_table); |
681 ctnew = alloc_lcrecord_type (Lisp_Char_Table, &lrecord_char_table); | 680 ctnew = alloc_lcrecord_type (Lisp_Char_Table, &lrecord_char_table); |
682 ctnew->type = ct->type; | 681 ctnew->type = ct->type; |
682 ctnew->parent = ct->parent; | |
683 ctnew->default_ = ct->default_; | |
683 | 684 |
684 for (i = 0; i < NUM_ASCII_CHARS; i++) | 685 for (i = 0; i < NUM_ASCII_CHARS; i++) |
685 { | 686 { |
686 Lisp_Object new = ct->ascii[i]; | 687 Lisp_Object new = ct->ascii[i]; |
687 #ifdef MULE | 688 #ifdef MULE |
706 if (CHAR_TABLEP (ct->mirror_table)) | 707 if (CHAR_TABLEP (ct->mirror_table)) |
707 ctnew->mirror_table = Fcopy_char_table (ct->mirror_table); | 708 ctnew->mirror_table = Fcopy_char_table (ct->mirror_table); |
708 else | 709 else |
709 ctnew->mirror_table = ct->mirror_table; | 710 ctnew->mirror_table = ct->mirror_table; |
710 ctnew->next_table = Qnil; | 711 ctnew->next_table = Qnil; |
711 XSETCHAR_TABLE (obj, ctnew); | 712 obj = wrap_char_table (ctnew); |
712 if (ctnew->type == CHAR_TABLE_TYPE_SYNTAX) | 713 if (ctnew->type == CHAR_TABLE_TYPE_SYNTAX) |
713 { | 714 { |
714 ctnew->next_table = Vall_syntax_tables; | 715 ctnew->next_table = Vall_syntax_tables; |
715 Vall_syntax_tables = obj; | 716 Vall_syntax_tables = obj; |
716 } | 717 } |