comparison src/database.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 943eaba38521
children c925bacdda60
comparison
equal deleted inserted replaced
792:4e83fdb13eb9 793:e38acbeb1cae
1 /* Database access routines 1 /* Database access routines
2 Copyright (C) 1996, William M. Perry 2 Copyright (C) 1996, William M. Perry
3 Copyright (C) 2001 Ben Wing. 3 Copyright (C) 2001, 2002 Ben Wing.
4 4
5 This file is part of XEmacs. 5 This file is part of XEmacs.
6 6
7 XEmacs is free software; you can redistribute it and/or modify it 7 XEmacs is free software; you can redistribute it and/or modify it
8 under the terms of the GNU General Public License as published by the 8 under the terms of the GNU General Public License as published by the
104 DB_FUNCS *funcs; 104 DB_FUNCS *funcs;
105 Lisp_Object coding_system; 105 Lisp_Object coding_system;
106 }; 106 };
107 107
108 #define XDATABASE(x) XRECORD (x, database, Lisp_Database) 108 #define XDATABASE(x) XRECORD (x, database, Lisp_Database)
109 #define XSETDATABASE(x, p) XSETRECORD (x, p, database)
110 #define wrap_database(p) wrap_record (p, database) 109 #define wrap_database(p) wrap_record (p, database)
111 #define DATABASEP(x) RECORDP (x, database) 110 #define DATABASEP(x) RECORDP (x, database)
112 #define CHECK_DATABASE(x) CHECK_RECORD (x, database) 111 #define CHECK_DATABASE(x) CHECK_RECORD (x, database)
113 #define CONCHECK_DATABASE(x) CONCHECK_RECORD (x, database) 112 #define CONCHECK_DATABASE(x) CONCHECK_RECORD (x, database)
114 #define DATABASE_LIVE_P(x) (x->live_p) 113 #define DATABASE_LIVE_P(x) (x->live_p)
148 } 147 }
149 148
150 static void 149 static void
151 print_database (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) 150 print_database (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
152 { 151 {
153 char buf[64];
154 Lisp_Database *db = XDATABASE (obj); 152 Lisp_Database *db = XDATABASE (obj);
155 153
156 if (print_readably) 154 if (print_readably)
157 printing_unreadable_object ("#<database 0x%x>", db->header.uid); 155 printing_unreadable_object ("#<database 0x%x>", db->header.uid);
158 156
159 write_c_string ("#<database \"", printcharfun); 157 write_fmt_string_lisp (printcharfun, "#<database \"%s\" (%s/%s/",
160 print_internal (db->fname, printcharfun, 0); 158 3, db->fname, db->funcs->get_type (db),
161 sprintf (buf, "\" (%s/%s/%s) 0x%x>", 159 db->funcs->get_subtype (db));
162 (char *) string_data (XSYMBOL (db->funcs->get_type (db))->name), 160
163 (char *) string_data (XSYMBOL (db->funcs->get_subtype (db))->name), 161 write_fmt_string (printcharfun, "%s) 0x%x>",
164 (!DATABASE_LIVE_P (db) ? "closed" : 162 (!DATABASE_LIVE_P (db) ? "closed" :
165 (db->access_ & O_WRONLY) ? "writeonly" : 163 (db->access_ & O_WRONLY) ? "writeonly" :
166 (db->access_ & O_RDWR) ? "readwrite" : "readonly"), 164 (db->access_ & O_RDWR) ? "readwrite" : "readonly"),
167 db->header.uid); 165 db->header.uid);
168 write_c_string (buf, printcharfun);
169 } 166 }
170 167
171 static void 168 static void
172 finalize_database (void *header, int for_disksave) 169 finalize_database (void *header, int for_disksave)
173 { 170 {
174 Lisp_Database *db = (Lisp_Database *) header; 171 Lisp_Database *db = (Lisp_Database *) header;
175 172
176 if (for_disksave) 173 if (for_disksave)
177 { 174 {
178 Lisp_Object object;
179 XSETDATABASE (object, db);
180
181 invalid_operation 175 invalid_operation
182 ("Can't dump an emacs containing database objects", object); 176 ("Can't dump an emacs containing database objects",
177 wrap_database (db));
183 } 178 }
184 db->funcs->close (db); 179 db->funcs->close (db);
185 } 180 }
186 181
187 DEFINE_LRECORD_IMPLEMENTATION ("database", database, 182 DEFINE_LRECORD_IMPLEMENTATION ("database", database,
731 db->live_p = 1; 726 db->live_p = 1;
732 db->fname = file; 727 db->fname = file;
733 db->mode = modemask; 728 db->mode = modemask;
734 db->access_ = accessmask; 729 db->access_ = accessmask;
735 730
736 { 731 return wrap_database (db);
737 Lisp_Object retval;
738 XSETDATABASE (retval, db);
739 return retval;
740 }
741 } 732 }
742 733
743 DEFUN ("put-database", Fput_database, 3, 4, 0, /* 734 DEFUN ("put-database", Fput_database, 3, 4, 0, /*
744 Store KEY and VALUE in DATABASE. 735 Store KEY and VALUE in DATABASE.
745 If optional fourth arg REPLACE is non-nil, 736 If optional fourth arg REPLACE is non-nil,