Re: Web site bug

[Bastien <bzg@altern.org>]

Hi Achim,

Achim Gratz <Stromeko@nexgo.de> writes:

> It is if you are using Org from Git and you only want the autoload
> definitions pulled in on startup and not the whole of Org plus most of
> its dependencies.  This is what a
>
> (require 'org-install)
>
> did before the change to org-loaddefs.el.  You can't rely on some older
> Org version in Emacs or whereever to supply the correct autoload
> definitions, so you eitehr need to
>
> (require 'org-loaddefs)
>
> which is horribly wrong in case you're not using Org from Git; 

You mean "in case users install Org from a tar/zip archive that does
not contain org-loaddefs.el"?

For now the tar/zip archives does not contain org-loaddefs.el but it
will starting from Org 7.9.3.

(require 'org-loaddefs) is wrong in case users who cloned Org from Git
forget to "make" or "make autoloads".  It is just as wrong as (require
'org-install) was previously.  No?

> or
>
> (require 'org)
>
> which is pulling in too much stuff on startup.
>
> Org from Git is currently missing the first-level autoloads file that
> was implicitly introduced for all other use-cases with that change
> (loaddefs.el for vanilla Emacs and org-autoloads.el for package
> manager).  

You mean Org from Git is missing the org-loaddefs.el that is produced 
by "make" or "make autoloads"?

Yes, I don't think this is a problem. 

> I propose to re-introduce org-install.el for this purpose for
> standalone Org.

I don't really understand what this is supposed to fix... ?

> 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.")
> -\f
> -(provide 'org-install)
> -\f
> -;; 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")
                    ^^^^^^^^^^^^^^^

I don't know what "autoload-rubric" is.  Hint?

Thanks,

-- 
 Bastien