comparison lisp/make-docfile.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 1ee424086c62
children ab9e8f0fb295
comparison
equal deleted inserted replaced
4535:69a1eda3da06 4539:061e030e3270
149 (load "find-paths.el") 149 (load "find-paths.el")
150 (load "packages.el") 150 (load "packages.el")
151 (load "setup-paths.el") 151 (load "setup-paths.el")
152 (load "raw-process.el") 152 (load "raw-process.el")
153 153
154 (let (preloaded-file-list) 154 (let (preloaded-file-list arg0 arg package-preloaded-file-list)
155 (load (expand-file-name "dumped-lisp.el" source-lisp)) 155 (load (expand-file-name "dumped-lisp.el" source-lisp))
156 156
157 (let ((package-preloaded-file-list 157 (setq package-preloaded-file-list
158 (packages-collect-package-dumped-lisps late-package-load-path))) 158 (packages-collect-package-dumped-lisps late-package-load-path)
159 159 preloaded-file-list
160 (setq preloaded-file-list 160 (append package-preloaded-file-list
161 (append package-preloaded-file-list 161 preloaded-file-list
162 preloaded-file-list 162 packages-hardcoded-lisp)
163 packages-hardcoded-lisp))) 163
164 processed (cons "-d" processed)
165 processed (cons source-lisp processed)
166 ;; Include loadup.el, which is never in preloaded-file-list:
167 processed (cons "loadup.el" processed))
164 168
165 (while preloaded-file-list 169 (while preloaded-file-list
166 (let ((arg0 (packages-add-suffix (car preloaded-file-list))) 170 (setq arg0 (packages-add-suffix (car preloaded-file-list))
167 arg) 171 arg (locate-library arg0))
168 (setq arg (locate-library arg0)) 172 (if (null arg)
169 (if (null arg) 173 (progn
170 (progn
171 (message "Error: dumped file %s does not exist" arg0) 174 (message "Error: dumped file %s does not exist" arg0)
172 ;; Uncomment in case of difficulties 175 ;; Uncomment in case of difficulties
173 ;;(message "late-package-hierarchies: %S" late-package-hierarchies) 176 ;(message "late-package-hierarchies: %S"
174 ;;(message "guessed-roots: %S" (paths-find-emacs-roots invocation-directory invocation-name #'paths-emacs-root-p)) 177 ; late-package-hierarchies)
175 ;;(message "guessed-data-roots: %S" (paths-find-emacs-roots invocation-directory invocation-name #'paths-emacs-data-root-p)) 178 ;(message "guessed-roots: %S" (paths-find-emacs-roots
176 ) 179 ; invocation-directory
177 (if (null (member arg processed)) 180 ; invocation-name
178 (progn 181 ; #'paths-emacs-root-p))
179 (if (and (null docfile-out-of-date) 182 ;(message "guessed-data-roots: %S" (paths-find-emacs-roots
180 (file-newer-than-file-p arg docfile)) 183 ; invocation-directory
181 (setq docfile-out-of-date t)) 184 ; invocation-name
182 (setq processed (cons arg processed))))) 185 ; #'paths-emacs-data-root-p))
183 (setq preloaded-file-list (cdr preloaded-file-list))))) 186 )
187 (when (equal arg (expand-file-name arg0 source-lisp))
188 ;; Use relative paths where possible, since this makes file lookup
189 ;; in an installed XEmacs easier:
190 (setq arg arg0))
191 (if (null (member arg processed))
192 (progn
193 (if (and (null docfile-out-of-date)
194 (file-newer-than-file-p arg docfile))
195 (setq docfile-out-of-date t))
196 (setq processed (cons arg processed)))))
197 (setq preloaded-file-list (cdr preloaded-file-list))))
184 198
185 ;; Finally process the list of site-loaded files. 199 ;; Finally process the list of site-loaded files.
186 (if site-file-list 200 (if site-file-list
187 (let (site-load-packages) 201 (let (site-load-packages)
188 (load site-file-list t t) 202 (load site-file-list t t)