annotate lisp/files-nomule.el @ 617:af57a77cbc92

[xemacs-hg @ 2001-06-18 07:09:50 by ben] --------------------------------------------------------------- DOCUMENTATION FIXES: --------------------------------------------------------------- eval.c: Correct documentation. elhash.c: Doc correction. --------------------------------------------------------------- LISP OBJECT CLEANUP: --------------------------------------------------------------- bytecode.h, buffer.h, casetab.h, chartab.h, console-msw.h, console.h, database.c, device.h, eldap.h, elhash.h, events.h, extents.h, faces.h, file-coding.h, frame.h, glyphs.h, gui-x.h, gui.h, keymap.h, lisp-disunion.h, lisp-union.h, lisp.h, lrecord.h, lstream.h, mule-charset.h, objects.h, opaque.h, postgresql.h, process.h, rangetab.h, specifier.h, toolbar.h, tooltalk.h, ui-gtk.h: Add wrap_* to all objects (it was already there for a few of them) -- an expression to encapsulate a pointer into a Lisp object, rather than the inconvenient XSET*. "wrap" was chosen because "make" as in make_int(), make_char() is not appropriate. (It implies allocation. The issue does not exist for ints and chars because they are not allocated.) Full error checking has been added to these expressions. When used without error checking, non-union build, use of these expressions will incur no loss of efficiency. (In fact, XSET* is now defined in terms of wrap_* in a non-union build.) In a union build, you will also get no loss of efficiency provided that you have a decent optimizing compiler, and a compiler that either understands inlines or automatically inlines those particular functions. (And since people don't normally do their production builds on union, it doesn't matter.) Update the sample Lisp object definition in lrecord.h accordingly. dumper.c: Fix places in dumper that referenced wrap_object to reference its new name, wrap_pointer_1. buffer.c, bufslots.h, conslots.h, console.c, console.h, devslots.h, device.c, device.h, frame.c, frame.h, frameslots.h, window.c, window.h, winslots.h: -- Extract out the Lisp objects of `struct device' into devslots.h, just like for the other structures. -- Extract out the remaining (not copied into the window config) Lisp objects in `struct window' into winslots.h; use different macros (WINDOW_SLOT vs. WINDOW_SAVED_SLOT) to differentiate them. -- Eliminate the `dead' flag of `struct frame', since it duplicates information already available in `framemeths', and fix FRAME_LIVE_P accordingly. (Devices and consoles already work this way.) -- In *slots.h, switch to system where MARKED_SLOT is automatically undef'd at the end of the file. (Follows what winslots.h already does.) -- Update the comments at the beginning of *slots.h to be accurate. -- When making any of the above objects dead, zero it out entirely and reset all Lisp object slots to Qnil. (We were already doing this somewhat, but not consistently.) This (1) Eliminates the possibility of extra objects hanging around that ought to be GC'd, (2) Causes an immediate crash if anyone tries to access a structure in one of these objects, (3) Ensures consistent behavior wrt dead objects. dialog-msw.c: Use internal_object_printer, since this object should not escape. --------------------------------------------------------------- FIXING A CRASH THAT I HIT ONCE (AND A RELATED BAD BEHAVIOR): --------------------------------------------------------------- eval.c: Fix up some comments about the FSF implementation. Fix two nasty bugs: (1) condition_case_unwind frees the conses sitting in the catch->tag slot too quickly, resulting in a crash that I hit. (2) catches need to be unwound one at a time when calling unwind-protect code, rather than all at once at the end; otherwise, incorrect behavior can result. (A comment shows exactly how.) backtrace.h: Improve comment about FSF differences in the handler stack. --------------------------------------------------------------- FIXING A CRASH THAT I REPEATEDLY HIT WHEN USING THE MOUSE WHEEL UNDER MSWINDOWS: --------------------------------------------------------------- Basic idea: My crash is due either to a dead, non-marked, GC-collected frame inside of a window mirror, or a prematurely freed window mirror. We need to mark the Lisp objects inside of window mirrors. Tracking the lifespan of window mirrors and scrollbar instances is extremely hard, and there may well be lurking bugs where such objects are freed too soon. The only safe way to fix these problems (and it fixes both problems at once) is to make both of these structures Lisp objects. lrecord.h, emacs.c, inline.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, symsinit.h: Make scrollbar instances actual Lisp objects. Mark the window mirrors in them. inline.c needs to know about scrollbar.h now. Record the new type in lrecord.h. Fix up scrollbar-*.c appropriately. Create a hash table in scrollbar-msw.c so that the scrollbar instances stored in scrollbar HWND's are properly GC-protected. Create complex_vars_of_scrollbar_mswindows() to create the hash table at startup, and call it from emacs.c. Don't store the scrollbar instance as a property of the GTK scrollbar, as it's not used and if we did this, we'd have to separately GC-protect it in a hash table, like in MS Windows. lrecord.h, frame.h, frame.c, frameslots.h, redisplay.c, window.c, window.h: Move mark_window_mirror from redisplay.c to window.c. Make window mirrors actual Lisp objects. Tell lrecord.h about them. Change the window mirror member of struct frame from a pointer to a Lisp object, and add XWINDOW_MIRROR in appropriate places. Mark the scrollbar instances in the window mirror. redisplay.c, redisplay.h, alloc.c: Delete mark_redisplay. Don't call mark_redisplay. We now mark frame-specific structures in mark_frame. NOTE: I also deleted an extremely questionable call to update_frame_window_mirrors(). It was extremely questionable before, and now totally impossible, since it will create Lisp objects during redisplay. frame.c: Mark the scrollbar instances, which are now Lisp objects. Call mark_gutter() here, not in mark_redisplay(). gutter.c: Update comments about correct marking. --------------------------------------------------------------- ISSUES BROUGHT UP BY MARTIN: --------------------------------------------------------------- buffer.h: Put back these macros the way Steve T and I think they ought to be. I already explained in a previous changelog entry why I think these macros should be the way I'd defined them. Once again: We fix these macros so they don't care about the type of their lvalues. The non-C-string equivalents of these already function in the same way, and it's correct because it should be OK to pass in a CBufbyte *, a BufByte *, a Char_Binary *, an UChar_Binary *, etc. The whole reason for these different types is to work around errors caused by signed-vs-unsigned non-matching types. Any possible error that might be caught in a DFC macro would also be caught wherever the argument is used elsewhere. So creating multiple macro versions would add no useful error-checking and just further complicate an already complicated area. As for Martin's "ANSI aliasing" bug, XEmacs is not ANSI-aliasing clean and probably never will be. Unless the board agrees to change XEmacs in this way (and we really don't want to go down that road), this is not a bug. sound.h: Undo Martin's type change. signal.c: Fix problem identified by Martin with Linux and g++ due to non-standard declaration of setitimer(). systime.h: Update the docs for "qxe_" to point out why making the encapsulation explicit is always the right way to go. (setitimer() itself serves as an example.) For 21.4: update-elc-2.el: Correct misplaced parentheses, making lisp/mule not get recompiled.
author ben
date Mon, 18 Jun 2001 07:10:32 +0000
parents 576fb035e263
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1 ;;; files-nomule.el --- file I/O stubs when not under Mule.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3 ;; Copyright (C) 1985-1987, 1992-1994, 1997 Free Software Foundation, Inc.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
4 ;; Copyright (C) 1995 Sun Microsystems.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
5
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
6 ;; Maintainer: XEmacs Development Team
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
7 ;; Keywords: extensions, dumped
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
8
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
9 ;; This file is part of XEmacs.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
10
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
11 ;; XEmacs is free software; you can redistribute it and/or modify it
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
12 ;; under the terms of the GNU General Public License as published by
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
13 ;; the Free Software Foundation; either version 2, or (at your option)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
14 ;; any later version.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
15
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
16 ;; XEmacs is distributed in the hope that it will be useful, but
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
17 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
19 ;; General Public License for more details.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
20
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
21 ;; You should have received a copy of the GNU General Public License
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 209
diff changeset
22 ;; along with XEmacs; see the file COPYING. If not, write to the
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
23 ;; Free Software Foundation, 59 Temple Place - Suite 330,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
24 ;; Boston, MA 02111-1307, USA.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
25
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
26 ;;; Synched up with: FSF 19.34 (files.el). (Is it? Please check)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
27
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
28 ;;; Commentary:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
29
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
30 ;; This file is dumped with XEmacs (when Mule is not compiled in).
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
31
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
32 ;; These stubs were moved from the bottom of files.el.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
33
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
34 ;;; Code:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
35
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 209
diff changeset
36 (defun insert-file-contents (filename &optional visit start end replace)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
37 "Insert contents of file FILENAME after point.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
38 Returns list of absolute file name and length of data inserted.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
39 If second argument VISIT is non-nil, the buffer's visited filename
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
40 and last save file modtime are set, and it is marked unmodified.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
41 If visiting and the file does not exist, visiting is completed
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
42 before the error is signaled.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
43
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 209
diff changeset
44 The optional third and fourth arguments START and END
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
45 specify what portion of the file to insert.
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 209
diff changeset
46 If VISIT is non-nil, START and END must be nil.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
47 If optional fifth argument REPLACE is non-nil,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
48 it means replace the current buffer contents (in the accessible portion)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
49 with the file contents. This is better than simply deleting and inserting
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
50 the whole thing because (1) it preserves some marker positions
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
51 and (2) it puts less data in the undo list."
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 209
diff changeset
52 (insert-file-contents-internal filename visit start end replace nil nil))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
53
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
54 (defun write-region (start end filename &optional append visit lockname coding-system)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
55 "Write current region into specified file.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
56 By default, the file's existing contents are replaced by the specified region.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
57 When called from a program, takes three arguments:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
58 START, END and FILENAME. START and END are buffer positions.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
59 Optional fourth argument APPEND if non-nil means
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
60 append to existing file contents (if any).
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
61 Optional fifth argument VISIT if t means
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
62 set the last-save-file-modtime of buffer to this file's modtime
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
63 and mark buffer not modified.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
64 If VISIT is a string, it is a second file name;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
65 the output goes to FILENAME, but the buffer is marked as visiting VISIT.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
66 VISIT is also the file name to lock and unlock for clash detection.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
67 If VISIT is neither t nor nil nor a string,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
68 that means do not print the \"Wrote file\" message.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
69 The optional sixth arg LOCKNAME, if non-nil, specifies the name to
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
70 use for locking and unlocking, overriding FILENAME and VISIT.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
71 Kludgy feature: if START is a string, then that string is written
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
72 to the file, instead of any buffer contents, and END is ignored.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
73 Optional seventh argument CODING-SYSTEM is meaningful only if support
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
74 for Mule is present in XEmacs and specifies the coding system
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
75 used to encode the text when it is written out, and defaults to
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
76 the value of `buffer-file-coding-system' in the current buffer.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
77 When Mule support is not present, the CODING-SYSTEM argument is
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
78 ignored."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
79 (interactive "r\nFWrite region to file: ")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
80 (write-region-internal start end filename append visit lockname nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
81
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
82 (defun load (file &optional noerror nomessage nosuffix)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
83 "Execute a file of Lisp code named FILE.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
84 First try FILE with `.elc' appended, then try with `.el',
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
85 then try FILE unmodified.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
86 This function searches the directories in `load-path'.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
87 If optional second arg NOERROR is non-nil,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
88 report no error if FILE doesn't exist.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
89 Print messages at start and end of loading unless
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
90 optional third arg NOMESSAGE is non-nil (ignored in -batch mode).
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
91 If optional fourth arg NOSUFFIX is non-nil, don't try adding
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
92 suffixes `.elc' or `.el' to the specified name FILE.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
93 Return t if file exists."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
94 (load-internal file noerror nomessage nosuffix nil nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
95
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
96 ;;; files-nomule.el ends here