From mboxrd@z Thu Jan 1 00:00:00 1970 From: Achim Gratz Subject: Re: Web site bug Date: Sun, 28 Oct 2012 08:36:33 +0100 Message-ID: <87625vhwu6.fsf@Rainer.invalid> References: <5088513F.7000202@gmx.de> <87k3ufwkyr.fsf@bzg.ath.cx> <508AEB33.8050205@gmx.de> <871ugks721.fsf@bzg.ath.cx> <80d304gur0.fsf@somewhere.org> <87hapgnv18.fsf@bzg.ath.cx> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([208.118.235.92]:49879) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSNQQ-0004IL-HS for emacs-orgmode@gnu.org; Sun, 28 Oct 2012 03:36:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TSNQP-0000xp-3h for emacs-orgmode@gnu.org; Sun, 28 Oct 2012 03:36:50 -0400 Received: from plane.gmane.org ([80.91.229.3]:48269) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TSNQO-0000xl-Pf for emacs-orgmode@gnu.org; Sun, 28 Oct 2012 03:36:49 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1TSNQT-0003a0-Na for emacs-orgmode@gnu.org; Sun, 28 Oct 2012 08:36:53 +0100 Received: from pd9eb33e3.dip.t-dialin.net ([217.235.51.227]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 28 Oct 2012 08:36:53 +0100 Received: from Stromeko by pd9eb33e3.dip.t-dialin.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 28 Oct 2012 08:36:53 +0100 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org --=-=-= Content-Type: text/plain Bastien writes: > No, (require 'org-loaddefs) is never needed IMHO. 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 sing Org from Git; 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). I propose to re-introduce org-install.el for this purpose for standalone Org. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-Re-introduce-org-install.el.patch >From 6b2d3f7689078f836cf1dbd8ee508131e8b22ef5 Mon Sep 17 00:00:00 2001 From: Achim Gratz 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 --=-=-= Content-Type: text/plain Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ Samples for the Waldorf Blofeld: http://Synth.Stromeko.net/Downloads.html#BlofeldSamplesExtra --=-=-=--