Commit ca7dd4cd authored by Glenn Morris's avatar Glenn Morris
Browse files

* lisp/ (autoloads): Do not use abs_lisp.

This should stop recent weirdness, eg:

* lisp/emacs-lisp/autoload.el: Comment.
parent 4f85b479
2013-10-30 Glenn Morris <>
* (autoloads): Do not use abs_lisp.
* emacs-lisp/autoload.el (autoload-generate-file-autoloads):
`newline' does not respect `standard-output', so use `princ'.
......@@ -178,13 +178,15 @@ finder-data: doit
$(emacs) -l finder --eval '(setq generated-finder-keywords-file (unmsys--file-name "$(abs_lisp)/finder-inf.el"))' -f finder-compile-keywords-make-dist $$wins
# The chmod +w is to handle env var CVSREAD=1.
# Use expand-file-name rather than $abs_lisp so that Emacs does not
# get confused when it compares file-names for equality.
autoloads: $(LOADDEFS) doit
cd $(lisp) && chmod +w $(AUTOGEN_VCS)
cd $(lisp) && $(setwins_almost); \
echo Directories: $$wins; \
$(emacs) -l autoload \
--eval '(setq autoload-builtin-package-versions t)' \
--eval '(setq generated-autoload-file (unmsys--file-name "$(abs_lisp)/loaddefs.el"))' \
--eval '(setq generated-autoload-file (expand-file-name (unmsys--file-name "$(lisp)/loaddefs.el")))' \
-f batch-update-autoloads $$wins
# This is required by the bootstrap-emacs target in ../src/Makefile, so
......@@ -528,6 +528,9 @@ Return non-nil if and only if FILE adds no autoloads to OUTFILE
(if (stringp generated-autoload-load-name)
(autoload-file-load-name absfile)))
;; FIXME? Comparing file-names for equality with just equal
;; is fragile, eg if one has an automounter prefix and one
;; does not, but both refer to the same physical file.
(when (and outfile
(if (memq system-type '(ms-dos windows-nt))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment