From 6b2d3f7689078f836cf1dbd8ee508131e8b22ef5 Mon Sep 17 00:00:00 2001
From: Achim Gratz <Stromeko@Stromeko.DE>
Date: Sun, 28 Oct 2012 08:23:22 +0100
Subject: [PATCH] Re-introduce org-install.el

* lisp/org-install.el: Delete from version control, is autogenerated
  again.  An empty file should be provided in Emacs and for ELPA as
  before.

* mk/org-fixup.el (org-make-org-loaddefs): Arrange for org-install to
  collect the "first-level" autoload definitions for standalone
  Org (like loaddefs.el for Emacs and org-autoloads.el for package
  manager).  The autoloads in org-loaddefs.el will be identical
  "second-level" for all installations.  The "first-level" autoload
  definitions are automatically loaded by EMacs or package manager,
  respectively.  For standalone Org, the user has to "(require
  'org-install)", as has been customary.

FIXME: this implementation does not support XEmacs.
---
 lisp/org-install.el | 13 -------------
 mk/org-fixup.el     | 15 ++++-----------
 2 files changed, 4 insertions(+), 24 deletions(-)
 delete mode 100644 lisp/org-install.el

diff --git a/lisp/org-install.el b/lisp/org-install.el
deleted file mode 100644
index a31d8b7..0000000
--- a/lisp/org-install.el
+++ /dev/null
@@ -1,13 +0,0 @@
-;;; org-install.el --- autogenerated file, do not edit
-;;
-;;; Code:
-(warn "The file org-install is obsolete.
-Please change your configuration to (require 'org) instead.")
-
-(provide 'org-install)
-
-;; Local Variables:
-;; no-byte-compile: t
-;; coding: utf-8
-;; End:
-;;; org-install.el ends here
diff --git a/mk/org-fixup.el b/mk/org-fixup.el
index 7b59efb..e5dee9a 100644
--- a/mk/org-fixup.el
+++ b/mk/org-fixup.el
@@ -67,17 +67,10 @@ (defun org-make-org-loaddefs ()
 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-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-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-loaddefs.el ends here\n")
-    (toggle-read-only 0)
-    (save-buffer)))
+  (write-region (autoload-rubric "org-install.el" nil "org-install") nil "org-install.el")
+  (write-region (autoload-rubric "org-loaddefs.el" nil "org-loaddefs") nil "org-install.el")
+  (let ((generated-autoload-file (expand-file-name "org-install.el" default-directory)))
+    (update-directory-autoloads (file-name-directory generated-autoload-file))))
 
 (defun org-make-autoloads (&optional compile force)
   "Make the files org-loaddefs.el and org-version.el in the install directory.
-- 
1.8.0