Merge branch 'maint'

2 files changed, 11 insertions, 11 deletions

diff --git a/mk/default.mk b/mk/default.mk
index 3e1c5505f..dcd29476a 100644
--- a/mk/default.mk
+++ b/mk/default.mk
@@ -56,7 +56,7 @@ BTEST	= $(BATCH) \
 	  --eval '(add-to-list '"'"'load-path "./lisp")' \
 	  --eval '(add-to-list '"'"'load-path "./testing")' \
 	  $(BTEST_POST) \
-	  -l org-install.el \
+	  -l org-loaddefs.el \
 	  -l testing/org-test.el \
 	  $(foreach ob-lang,$(BTEST_OB_LANGUAGES),$(req-ob-lang)) \
 	  $(foreach req,$(BTEST_EXTRA),$(req-extra)) \
@@ -81,11 +81,11 @@ MAKE_LOCAL_MK = $(BATCHO) \
 BATCHL	= $(BATCH) \
 	  --eval '(add-to-list '"'"'load-path ".")'
 
-# How to generate org-install.el
+# How to generate org-loaddefs.el
 MAKE_ORG_INSTALL = $(BATCHL) \
 	  --eval '(load "org-compat.el")' \
 	  --eval '(load "../mk/org-fixup.el")' \
-	  --eval '(org-make-org-install)'
+	  --eval '(org-make-org-loaddefs)'
 
 # How to generate org-version.el
 MAKE_ORG_VERSION = $(BATCHL) \
diff --git a/mk/org-fixup.el b/mk/org-fixup.el
index b0e51b85f..7b59efb88 100644
--- a/mk/org-fixup.el
+++ b/mk/org-fixup.el
@@ -61,26 +61,26 @@ the Git work tree)."
     (toggle-read-only 0)
     (write-file "org-version.el")))
 
-(defun org-make-org-install ()
-  "Make the file org-install.el in the current directory.
+(defun org-make-org-loaddefs ()
+  "Make the file org-loaddefs.el in the current directory.
 This function is internally used by the build system and should
 be used by foreign build systems or installers to produce this
 file in the installation directory of org-mode.  Org will not
 work correctly if this file is not up-to-date."
   (with-temp-buffer
-    (set-visited-file-name "org-install.el")
-    (insert ";;; org-install.el --- autogenerated file, do not edit\n;;\n;;; Code:\n")
+    (set-visited-file-name "org-loaddefs.el")
+    (insert ";;; org-loaddefs.el --- autogenerated file, do not edit\n;;\n;;; Code:\n")
     (let ((files (directory-files default-directory nil "^\\(org\\|ob\\)\\(-.*\\)?\\.el$")))
       (mapc (lambda (f) (generate-file-autoloads f)) files))
-    (insert "\f\n(provide 'org-install)\n")
+    (insert "\f\n(provide 'org-loaddefs)\n")
     (insert "\f\n;; Local Variables:\n;; version-control: never\n")
     (insert ";; no-byte-compile: t\n;; no-update-autoloads: t\n")
-    (insert ";; coding: utf-8\n;; End:\n;;; org-install.el ends here\n")
+    (insert ";; coding: utf-8\n;; End:\n;;; org-loaddefs.el ends here\n")
     (toggle-read-only 0)
     (save-buffer)))
 
 (defun org-make-autoloads (&optional compile force)
-  "Make the files org-install and org-version.el in the install directory.
+  "Make the files org-loaddefs.el and org-version.el in the install directory.
 Finds the install directory by looking for library \"org\".
 Optionally byte-compile lisp files in the install directory or
 force re-compilation.  This function is provided for easier
@@ -96,7 +96,7 @@ manual install when the build system can't be used."
 	  (cd dirlisp)
 	  (org-fixup)
 	  (org-make-org-version (org-release) (org-git-version) dirodt)
-	  (org-make-org-install)
+	  (org-make-org-loaddefs)
 	  (when compile (byte-recompile-directory dirlisp 0 force)))
       (cd origin))))