Mercurial > hg > xemacs-beta
view src/sysdir.h @ 4539:061e030e3270
Fix some bugs in load-history construction, built-in symbol file names.
lib-src/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* make-docfile.c (main): Allow more than one -d argument, followed
by a directory to change to.
(put_filename): Don't strip directory information; with previous
change, allows retrieval of Lisp function and variable origin
files from #'built-in-symbol-file relative to lisp-directory.
(scan_lisp_file): Don't add an extraneous newline after the file
name, put_filename has added the newline already.
lisp/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* loadup.el (load-history):
Add the contents of current-load-list to load-history before
clearing it. Move the variable declarations earlier in the file to
a format understood by make-docfile.c.
* custom.el (custom-declare-variable): Add the variable's symbol
to the current file's load history entry correctly, don't use a
cons. Eliminate a comment that we don't need to worry about, we
don't need to check the `initialized' C variable in Lisp.
* bytecomp.el (byte-compile-output-file-form):
Merge Andreas Schwab's pre-GPLv3 GNU change of 19970831 here;
treat #'custom-declare-variable correctly, generating the
docstrings in a format understood by make-docfile.c.
* loadhist.el (symbol-file): Correct behaviour for checking
autoloaded macros and functions when supplied with a TYPE
argument. Accept fully-qualified paths from
#'built-in-symbol-file; if a path is not fully-qualified, return
it relative to lisp-directory if the filename corresponds to a
Lisp file, and relative to (concat source-directory "/src/")
otherwise.
* make-docfile.el (preloaded-file-list):
Rationalise some let bindings a little. Use the "-d" argument to
make-docfile.c to supply Lisp paths relative to lisp-directory,
not absolutely. Add in loadup.el explicitly to the list of files
to be processed by make-docfile.c--it doesn't make sense to add it
to preloaded-file-list, since that is used for purposes of
byte-compilation too.
src/ChangeLog addition:
2008-12-27 Aidan Kehoe <kehoea@parhasard.net>
* doc.c (Fbuilt_in_symbol_file):
Return a subr's filename immediately if we've found it. Check for
compiled function and compiled macro docstrings in DOC too, and
return them if they exist.
The branch of the if statement focused on functions may have
executed, but we may still want to check variable bindings; an
else clause isn't appropriate.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 27 Dec 2008 14:05:50 +0000 |
parents | 6bade5a5afc0 |
children | 308d34e9f07d |
line wrap: on
line source
/* Copyright (C) 1995 Free Software Foundation, Inc. Copyright (C) 2000 Ben Wing. 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not really in FSF. */ #ifndef INCLUDED_sysdir_h_ #define INCLUDED_sysdir_h_ #ifdef HAVE_UNISTD_H #include <unistd.h> #endif #ifdef SYSV_SYSTEM_DIR # define select select_ /* Shadowing yuck */ # include <dirent.h> # undef select #elif defined (WIN32_NATIVE) # include <direct.h> # include "ndir.h" #elif defined (NONSYSTEM_DIR_LIBRARY) # include "ndir.h" #else # include <sys/dir.h> #endif /* not NONSYSTEM_DIR_LIBRARY */ #ifdef SYSV_SYSTEM_DIR # define DIRENTRY struct dirent #else /* not SYSV_SYSTEM_DIR */ # define DIRENTRY struct direct #endif /* The d_nameln member of a struct dirent includes the '\0' character on some systems, but not on others. What's worse, you can't tell at compile-time which one it will be, since it really depends on the sort of system providing the filesystem you're reading from, not the system you are running on. Paul Eggert <eggert@bi.twinsun.com> says this occurs when Emacs is running on a SunOS 4.1.2 host, reading a directory that is remote-mounted from a Solaris 2.1 host and is in a native Solaris 2.1 filesystem. (and Solaris 2 doesn't have a d_nameln member at all! Posix.1 doesn't specify it -- mrb) Since applying strlen to the name always works, we'll just do that. */ #define NAMLEN(p) strlen (p->d_name) # define DIRENTRY_NONEMPTY(p) ((p)->d_ino) /* encapsulation: directory calls */ int qxe_chdir (const Ibyte *path); int qxe_mkdir (const Ibyte *path, mode_t mode); DIR *qxe_opendir (const Ibyte *filename); DIRENTRY *qxe_readdir (DIR *dirp); int qxe_closedir (DIR *dirp); int qxe_rmdir (const Ibyte *path); Ibyte *qxe_allocating_getcwd (void); #endif /* INCLUDED_sysdir_h_ */