annotate nt/paths.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 4be1180a9e89
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
100
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
1 /* Hey Emacs, this is -*- C -*- code! */
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
2
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
3 /* Synched up with: Not synched with FSF. */
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
4
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
5 /* Think twice before editing this file. Generated automatically by configure.
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
6
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
7 The file startup.el guesses at reasonable values for load-path, exec-path,
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
8 and lock-directory. This means that if you move emacs and its associated
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
9 sub-tree to a different place in the filesystem, or to a different machine,
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
10 you won't have to do anything for it to work.
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
11
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
12 If you define the paths in this file then they will take precedence over
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
13 any value generated by the heuristic in startup.el. The hardcoded paths
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
14 will be checked to see if they are valid, in which case they will be used.
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
15 Otherwise the editor will attempt to make its normal guess.
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
16
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
17 See the NEWS file for a description of the heuristic used to locate the lisp
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
18 and exec directories at startup time. If you are looking at this file
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
19 because you are having trouble, then you would be much better off arranging
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
20 for those heuristics to succeed than defining the paths in this file.
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
21
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
22 ** Let me say that again. If you're editing this file, you're making
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
23 ** a mistake. Re-read the section on installation in ../etc/NEWS.
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
24
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
25 If it defines anything, this file should define some subset of the following:
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
26
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
27 PATH_PREFIX The default value of `prefix-directory'. This is the
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
28 default root for everything.
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
29
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
30 PATH_LOADSEARCH The default value of `load-path'.
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
31
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
32 PATH_EXEC The default value of `exec-directory' and `exec-path'.
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
33 (exec-path also contains the value of whatever is in
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
34 the PATH environment variable.)
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
35
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
36 PATH_DATA The default value of `data-directory'. This
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
37 is where architecture-independent files are
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
38 searched for.
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
39
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
40 PATH_LOCK The name of the directory that contains lock files
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
41 with which we record what files are being modified in
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
42 Emacs. This directory should be writable by everyone.
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
43 If this is specified, the string must end with a slash!
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
44
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
45 PATH_SUPERLOCK The name of the file !!!SuperLock!!! in the lock
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
46 directory. You probably should let this default...
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
47
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
48 PATH_INFO The default value of `Info-directory-list'.
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents:
diff changeset
49 This is where info files are searched for. */