Mercurial > hg > xemacs-beta
view src/paths.h.in @ 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 | 15139dbf89f4 |
children |
line wrap: on
line source
/* Hey Emacs, this is -*- C -*- code! */ /* Synched up with: Not synched with FSF. */ /* Think twice before editing this file. Generated automatically by configure. The file startup.el guesses at reasonable values for load-path, exec-path, and lock-directory. This means that if you move emacs and its associated sub-tree to a different place in the filesystem, or to a different machine, you won't have to do anything for it to work. If you define the paths in this file then they will take precedence over any value generated by the heuristic in startup.el. The hardcoded paths will be checked to see if they are valid, in which case they will be used. Otherwise the editor will attempt to make its normal guess. See the NEWS file for a description of the heuristic used to locate the lisp and exec directories at startup time. If you are looking at this file because you are having trouble, then you would be much better off arranging for those heuristics to succeed than defining the paths in this file. ** Let me say that again. If you're editing this file, you're making ** a mistake. Re-read the section on installation in ../etc/NEWS. If it defines anything, this file should define some subset of the following: PATH_PROGNAME The name of the Emacs variant that's running. PATH_VERSION The version id of the Emacs variant that's running. PATH_EXEC_PREFIX The value of --exec-prefix. PATH_PREFIX The value of --prefix. PATH_LOADSEARCH The default value of `load-path'. PATH_MODULESEARCH The default value of `module-load-path'. PATH_EARLY_PACKAGE_DIRECTORIES The value of `--with-early-packages'. PATH_LATE_PACKAGE_DIRECTORIES The value of `--with-late-packages'. PATH_EARLY_PACKAGE_DIRECTORIES The value of `--with-last-packages'. PATH_PACKAGEPATH The default value of `package-path'. PATH_SITE The default location of site-specific Lisp files. PATH_SITE_MODULES The default location of site-specific modules. PATH_EXEC The default value of `exec-directory' and `exec-path'. (exec-path also contains the value of whatever is in the PATH environment variable.) PATH_DATA The default value of `data-directory'. This is where architecture-independent files are searched for. PATH_INFO This is where the info documentation is installed. PATH_INFOPATH The default value of `Info-directory-list'. These are additional places info files are searched for. */ #define PATH_PROGNAME "@PROGNAME@" #define PATH_VERSION "@version@" #ifdef EXEC_PREFIX_USER_DEFINED #define PATH_EXEC_PREFIX "@EXEC_PREFIX@" #endif #ifdef PREFIX_USER_DEFINED #define PATH_PREFIX "@PREFIX@" #endif #ifdef LISPDIR_USER_DEFINED #define PATH_LOADSEARCH "@LISPDIR@" #endif #ifdef MODULEDIR_USER_DEFINED #define PATH_MODULESEARCH "@MODULEDIR@" #endif #ifdef SITELISPDIR_USER_DEFINED #define PATH_SITE "@SITELISPDIR@" #endif #ifdef SITEMODULEDIR_USER_DEFINED #define PATH_SITE_MODULES "@SITEMODULEDIR@" #endif #ifdef EARLY_PACKAGE_DIRECTORIES_USER_DEFINED #define PATH_EARLY_PACKAGE_DIRECTORIES "@EARLY_PACKAGE_DIRECTORIES@" #endif #ifdef LATE_PACKAGE_DIRECTORIES_USER_DEFINED #define PATH_LATE_PACKAGE_DIRECTORIES "@LATE_PACKAGE_DIRECTORIES@" #endif #ifdef LAST_PACKAGE_DIRECTORIES_USER_DEFINED #define PATH_LAST_PACKAGE_DIRECTORIES "@LAST_PACKAGE_DIRECTORIES@" #endif #ifdef PACKAGE_PATH_USER_DEFINED #define PATH_PACKAGEPATH "@PACKAGE_PATH@" #endif #ifdef ARCHLIBDIR_USER_DEFINED #define PATH_EXEC "@ARCHLIBDIR@" #endif #ifdef ETCDIR_USER_DEFINED #define PATH_DATA "@ETCDIR@" #endif #ifdef DOCDIR_USER_DEFINED #define PATH_DOC "@DOCDIR@" #endif #ifdef INFODIR_USER_DEFINED #define PATH_INFO "@INFODIR@" #endif #ifdef INFOPATH_USER_DEFINED #define PATH_INFOPATH "@INFOPATH@" #endif