annotate netinstall/reginfo.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 15139dbf89f4
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
1 /* reginfo.h -- XEmacs version numbers and accompanying documentation.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
2
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
3 Copyright (C) 2000 Andy Piper. */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
4
657
ce0b3f2eff35 [xemacs-hg @ 2001-09-09 04:37:41 by andyp]
andyp
parents: 452
diff changeset
5 #define XEMACS_INFO_XEMACS_ORG_REGISTRY_NAME "XEmacs"
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
6 #define XEMACS_INFO_XEMACS_REGISTRY_NAME "XEmacs"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
7 /* Keys */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
8 #define XEMACS_INFO_XEMACS_ROOT_KEY "emacs_dir"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
9 #define XEMACS_INFO_XEMACS_ROOT_TYPE "install_type"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
10 #define XEMACS_INFO_XEMACS_PACKAGE_KEY "EMACSPACKAGEPATH"
3179
15139dbf89f4 [xemacs-hg @ 2005-12-27 18:50:47 by michaels]
michaels
parents: 657
diff changeset
11 #define XEMACS_INFO_XEMACS_EARLY_PACKAGES_KEY "EMACSEARLYPACKAGES"
15139dbf89f4 [xemacs-hg @ 2005-12-27 18:50:47 by michaels]
michaels
parents: 657
diff changeset
12 #define XEMACS_INFO_XEMACS_LATE_PACKAGES_KEY "EMACSLATEPACKAGES"
15139dbf89f4 [xemacs-hg @ 2005-12-27 18:50:47 by michaels]
michaels
parents: 657
diff changeset
13 #define XEMACS_INFO_XEMACS_LAST_PACKAGES_KEY "EMACSLASTPACKAGES"
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
14 #define XEMACS_INFO_XEMACS_VERSION_KEY "version"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
15
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
16 #define XEMACS_DEFAULT_ROOT "\\Program Files\\XEmacs"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
17 #define XEMACS_CYGWIN_DEFAULT_ROOT "\\usr\\local"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
18
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
19 #define XEMACS_SETUP_DIR \
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
20 ((char*)(install_type == IDC_INSTALL_NATIVE ? "\\setup\\" : "/lib/xemacs/setup/"))
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
21 #define XEMACS_RESOURCE_DIR \
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
22 ((char*)(install_type == IDC_INSTALL_NATIVE ? "\\" : "/lib/xemacs/"))
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
23 #define XEMACS_PACKAGE_DIR \
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
24 ((char*)(install_type == IDC_INSTALL_NATIVE ? "\\xemacs-packages\\" \
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
25 : "/lib/xemacs/xemacs-packages/"))
657
ce0b3f2eff35 [xemacs-hg @ 2001-09-09 04:37:41 by andyp]
andyp
parents: 452
diff changeset
26 #define XEMACS_NATIVE_ARCH_NAME "i586-pc-win32"
ce0b3f2eff35 [xemacs-hg @ 2001-09-09 04:37:41 by andyp]
andyp
parents: 452
diff changeset
27 #define XEMACS_CYGWIN_ARCH_NAME "i686-pc-cygwin"
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
28
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
29 /*
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
30 * Installation hierarchy is:
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
31 * C:\Program Files\XEmacs
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
32 * \xemacs-packages
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
33 * \etc
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
34 * \info
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
35 * \lib-src
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
36 * \lisp
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
37 * \man
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
38 * \pkginfo
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
39 * \site-packages
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
40 * \mule-packages
657
ce0b3f2eff35 [xemacs-hg @ 2001-09-09 04:37:41 by andyp]
andyp
parents: 452
diff changeset
41 * \XEmacs-21.4
ce0b3f2eff35 [xemacs-hg @ 2001-09-09 04:37:41 by andyp]
andyp
parents: 452
diff changeset
42 * \i586-pc-win32
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
43 * \etc
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
44 * \info
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
45 * \lisp
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
46 * Or:
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
47 * /usr/local/lib
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
48 * /xemacs/xemacs-packages
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
49 * /xemacs/site-packages
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
50 * /xemacs/mule-packages
657
ce0b3f2eff35 [xemacs-hg @ 2001-09-09 04:37:41 by andyp]
andyp
parents: 452
diff changeset
51 * /xemacs-21.4
ce0b3f2eff35 [xemacs-hg @ 2001-09-09 04:37:41 by andyp]
andyp
parents: 452
diff changeset
52 * /i686-pc-cygwin
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
53 * /etc
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
54 * /info
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
55 * /lisp
657
ce0b3f2eff35 [xemacs-hg @ 2001-09-09 04:37:41 by andyp]
andyp
parents: 452
diff changeset
56 * /usr/local/bin/i686-pc-cygwin
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
57 */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
58
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
59