Mercurial > hg > xemacs-beta
view lisp/paths.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 | aa5ed11f473b |
line wrap: on
line source
;;; paths.el --- define pathnames for use by various Emacs commands. ;; Copyright (C) 1986, 1988, 1993, 1994, 1997 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal, dumped ;; This file is part of XEmacs. ;; XEmacs is free software; you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; XEmacs is distributed in the hope that it will be useful, but ;; WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the Free ;; Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. ;;; Synched up with: FSF 19.30. ;;; Commentary: ;; This file is dumped with XEmacs. ;; These are default settings for names of certain files and directories ;; that Emacs needs to refer to from time to time. ;; If these settings are not right, override them with `setq' ;; in site-start.el. Do not change this file. ;;; Code: ;Note: FSF's version is: ;(defvar Info-default-directory-list ; (let ((start (list "/usr/local/lib/info/" ; ;; This comes second so that, if it is the same ; ;; as configure-info-directory (which is usually true) ; ;; and Emacs has been installed (also usually true) ; ;; then the list will end with two copies of this; ; ;; which means that the last dir file Info-insert-dir ; ;; finds will be the one in this directory. ; "/usr/local/info/")) ; (configdir (file-name-as-directory configure-info-directory))) ; (setq start (nconc start (list configdir))) ; start) ; "List of directories to search for Info documentation files. ;They are searched in the order they are given in this list. ;Therefore, the directory of Info files that come with Emacs ;normally should come last (so that local files override standard ones).") ;Our commented-out version is: ;(defvar Info-default-directory-list ; (let ((start (list "/usr/local/info/" ; "/usr/local/lib/info/")) ; (configdir (file-name-as-directory configure-info-directory))) ; (or (member configdir start) ; (setq start (nconc start (list configdir)))) ; (or (member (expand-file-name "../info/" data-directory) start) ; (setq start ; (nconc start ; (list (expand-file-name "../info/" data-directory))))) ; start) ; "List of directories to search for Info documentation files.") (defvar news-path "/usr/spool/news/" "The root directory below which all news files are stored.") (defvar news-inews-program nil "Program to post news.") ;(defvar gnus-default-nntp-server "" ; ;; set this to your local server ; "The name of the host running an NNTP server. ;If it is a string such as \":DIRECTORY\", then ~/DIRECTORY ;is used as a news spool. `gnus-nntp-server' is initialized from NNTPSERVER ;environment variable or, if none, this value.") ;(defvar gnus-nntp-service "nntp" ; "NNTP service name, usually \"nntp\" or 119). ;Go to a local news spool if its value is nil, in which case `gnus-nntp-server' ;should be set to `(system-name)'.") (defvar mh-progs nil "Directory containing MH commands.") (defvar mh-lib nil "Directory of MH library.") (defvar rmail-file-name "~/RMAIL" "Name of user's primary mail file.") (defconst rmail-spool-directory nil "Name of directory used by system mailer for delivering new mail. Its name should end with a slash.") (defconst sendmail-program nil "Program used to send messages.") (defconst remote-shell-program nil "Program used to execute shell commands on a remote machine.") (defconst term-file-prefix "term/" "If non-nil, Emacs startup does (load (concat term-file-prefix (getenv \"TERM\"))) You may set this variable to nil in your `.emacs' file if you do not wish the terminal-initialization file to be loaded.") (defconst manual-program nil "Program to run to print man pages.") (defconst abbrev-file-name "~/.abbrev_defs" "*Default name of file to read abbrevs from.") (defconst directory-abbrev-alist nil) ;; Formerly, the values of these variables were computed once ;; (at dump time). However, with the advent of pre-compiled binaries ;; and homebrewed systems such as Linux where who knows where the ;; hell the various programs may be located (if they even exist at all), ;; it's clear that we need to recompute these values at run time. ;; In typical short-sightedness, site administrators have been told up ;; till now to do `setq's in site-init.el, which is run only once -- ;; at dump time. So we have to do contortions to make sure we don't ;; override values set in site-init.el. (defun initialize-xemacs-paths () "Initialize the XEmacs path variables from the environment. Called automatically at dump time and run time. Do not call this. Will not override settings in site-init.el or site-run.el." (let ((l #'(lambda (var value) (let ((origsym (intern (concat "paths-el-original-" (symbol-name var))))) (if (running-temacs-p) (progn (set var value) (set origsym value)) (and (eq (symbol-value var) (symbol-value origsym)) (set var value))))))) (funcall l 'news-inews-program (cond ((file-exists-p "/usr/bin/inews") "/usr/bin/inews") ((file-exists-p "/usr/local/inews") "/usr/local/inews") ((file-exists-p "/usr/local/bin/inews") "/usr/local/bin/inews") ((file-exists-p "/usr/lib/news/inews") "/usr/lib/news/inews") (t "inews"))) (funcall l 'mh-progs (cond ((file-directory-p "/usr/bin/mh") "/usr/bin/mh/") ;Ultrix 4.2 ((file-directory-p "/usr/new/mh") "/usr/new/mh/") ;Ultrix <4.2 ((file-directory-p "/usr/local/bin/mh") "/usr/local/bin/mh/") ((file-directory-p "/usr/local/mh") "/usr/local/mh/") (t "/usr/local/bin/"))) (funcall l 'mh-libs (cond ((file-directory-p "/usr/lib/mh") "/usr/lib/mh/") ;Ultrix 4.2 ((file-directory-p "/usr/new/lib/mh") "/usr/new/lib/mh/") ;Ultrix <4.2 ((file-directory-p "/usr/local/lib/mh") "/usr/local/lib/mh/") (t "/usr/local/bin/mh/"))) (funcall l 'rmail-spool-directory (cond ((string-match "^[^-]+-[^-]+-sco3.2v4" system-configuration) "/usr/spool/mail/") ;; On The Bull DPX/2 /usr/spool/mail is used although ;; it is usg-unix-v. ((string-match "^m68k-bull-sysv3" system-configuration) "/usr/spool/mail/") ;; SVR4 and recent BSD are said to use this. ;; Rather than trying to know precisely which systems use it, ;; let's assume this dir is never used for anything else. ((file-exists-p "/var/mail") "/var/mail/") ((memq system-type '(dgux hpux usg-unix-v unisoft-unix rtu irix)) "/usr/mail/") ((memq system-type '(linux)) "/var/spool/mail/") (t "/usr/spool/mail/"))) (funcall l 'sendmail-program (cond ((file-exists-p "/usr/lib/sendmail") "/usr/lib/sendmail") ((file-exists-p "/usr/sbin/sendmail") "/usr/sbin/sendmail") ((file-exists-p "/usr/ucblib/sendmail") "/usr/ucblib/sendmail") (t "fakemail"))) ;In ../etc, to interface to /bin/mail. (funcall l 'remote-shell-program (cond ;; Some systems use rsh for the remote shell; others use that ;; name for the restricted shell and use remsh for the remote ;; shell. Let's try to guess based on what we actually find ;; out there. The restricted shell is almost certainly in ;; /bin or /usr/bin, so it's probably safe to assume that an ;; rsh found elsewhere is the remote shell program. The ;; converse is not true: /usr/bin/rsh could be either one, so ;; check that last. ((file-exists-p "/usr/ucb/remsh") "/usr/ucb/remsh") ((file-exists-p "/usr/bsd/remsh") "/usr/bsd/remsh") ((file-exists-p "/bin/remsh") "/bin/remsh") ((file-exists-p "/usr/bin/remsh") "/usr/bin/remsh") ((file-exists-p "/usr/local/bin/remsh") "/usr/local/bin/remsh") ((file-exists-p "/usr/ucb/rsh") "/usr/ucb/rsh") ((file-exists-p "/usr/bsd/rsh") "/usr/bsd/rsh") ((file-exists-p "/usr/local/bin/rsh") "/usr/local/bin/rsh") ((file-exists-p "/usr/bin/rcmd") "/usr/bin/rcmd") ((file-exists-p "/bin/rcmd") "/bin/rcmd") ((file-exists-p "/bin/rsh") "/bin/rsh") ((file-exists-p "/usr/bin/rsh") "/usr/bin/rsh") (t "rsh"))) (funcall l 'manual-program ;; Solaris 2 has both of these files; prefer /usr/ucb/man ;; because the other has nonstandard argument conventions. (if (file-exists-p "/usr/ucb/man") "/usr/ucb/man" "/usr/bin/man")) (funcall l 'directory-abbrev-alist ;; Try to match various conventions for automounter temporary ;; mount points. These temporary mount points may go away, so ;; it's important that we only try to read files under the ;; "advertised" mount point, rather than the temporary one, or it ;; will look like files have been deleted on us. Whoever came up ;; with this design is clearly a moron of the first order, but ;; now we're stuck with it, no doubt until the end of time. ;; ;; For best results, automounter junk should go near the front of this ;; list, and other user translations should come after it. ;; ;; Our code handles the following empirically observed conventions: ;; /net is an actual directory! (some systems are not broken!) ;; /net/HOST -> /tmp_mnt/net/HOST (`standard' old Sun automounter) ;; /net/HOST -> /tmp_mnt/HOST (BSDI 4.0) ;; /net/HOST -> /a/HOST (Freebsd 2.2.x) ;; /net/HOST -> /amd/HOST (seen in amd sample config files) ;; ;; If your system has a different convention, you may have to change this. ;; Don't forget to send in a patch! (when (file-directory-p "/net") (append (when (file-directory-p "/tmp_mnt") (if (file-directory-p "/tmp_mnt/net") '(("\\`/tmp_mnt/net/" . "/net/")) '(("\\`/tmp_mnt/" . "/net/")))) (when (file-directory-p "/a") '(("\\`/a/" . "/net/"))) (when (file-directory-p "/amd") '(("\\`/amd/" . "/net/"))) ))) )) (if (running-temacs-p) (initialize-xemacs-paths)) ;;; paths.el ends here
