comparison lisp/bytecomp.el @ 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 6f41fb7f3a65
children a9f83990e6bf
comparison
equal deleted inserted replaced
4535:69a1eda3da06 4539:061e030e3270
1879 ;; in defun, defmacro, defvar, defconst and autoload because make-docfile is 1879 ;; in defun, defmacro, defvar, defconst and autoload because make-docfile is
1880 ;; so amazingly stupid. 1880 ;; so amazingly stupid.
1881 ;; defalias calls are output directly by byte-compile-file-form-defmumble; 1881 ;; defalias calls are output directly by byte-compile-file-form-defmumble;
1882 ;; it does not pay to first build the defalias in defmumble and then parse 1882 ;; it does not pay to first build the defalias in defmumble and then parse
1883 ;; it here. 1883 ;; it here.
1884 (if (and (memq (car-safe form) '(defun defmacro defvar defconst autoload)) 1884 (if (and (memq (car-safe form) '(defun defmacro defvar defconst autoload
1885 custom-declare-variable))
1885 (stringp (nth 3 form))) 1886 (stringp (nth 3 form)))
1886 (byte-compile-output-docform nil nil '("\n(" 3 ")") form nil 1887 (byte-compile-output-docform nil nil '("\n(" 3 ")") form nil
1887 (eq (car form) 'autoload)) 1888 (memq (car form)
1889 '(autoload custom-declare-variable)))
1888 (let ((print-escape-newlines t) 1890 (let ((print-escape-newlines t)
1889 (print-length nil) 1891 (print-length nil)
1890 (print-level nil) 1892 (print-level nil)
1891 (print-readably t) ; print #[] for bytecode, 'x for (quote x) 1893 (print-readably t) ; print #[] for bytecode, 'x for (quote x)
1892 (print-gensym (if (and byte-compile-print-gensym 1894 (print-gensym (if (and byte-compile-print-gensym