From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Rasmus Newsgroups: gmane.emacs.devel Subject: org-merger questions Date: Wed, 21 Jun 2017 17:09:06 +0200 Message-ID: <874lv9fkdp.fsf@gmx.us> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: blaine.gmane.org 1498057772 19823 195.159.176.226 (21 Jun 2017 15:09:32 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 21 Jun 2017 15:09:32 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) Cc: bzg@gnu.org, kyle@kyleam.com, Stromeko@Nexgo.DE, michael.albinus@gmx.de To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jun 21 17:09:27 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dNhG1-0004kH-JK for ged-emacs-devel@m.gmane.org; Wed, 21 Jun 2017 17:09:25 +0200 Original-Received: from localhost ([::1]:54611 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNhG6-0005uK-J0 for ged-emacs-devel@m.gmane.org; Wed, 21 Jun 2017 11:09:30 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43682) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNhFz-0005uE-2Y for emacs-devel@gnu.org; Wed, 21 Jun 2017 11:09:23 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dNhFv-0006DW-2n for emacs-devel@gnu.org; Wed, 21 Jun 2017 11:09:23 -0400 Original-Received: from [195.159.176.226] (port=49325 helo=blaine.gmane.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dNhFu-0006CQ-RZ for emacs-devel@gnu.org; Wed, 21 Jun 2017 11:09:19 -0400 Original-Received: from list by blaine.gmane.org with local (Exim 4.84_2) (envelope-from ) id 1dNhFj-0003sm-Q1 for emacs-devel@gnu.org; Wed, 21 Jun 2017 17:09:07 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 50 Original-X-Complaints-To: usenet@blaine.gmane.org Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAAAAAByaaZbAAAAAmJLR0QA/4ePzL8AAAAJcEhZ cwAAAEgAAABIAEbJaz4AAAICSURBVEgNdcHBQVxJAMXAjuLFp8wUp27bf8Aw2GzV6f/s6l+n/+Eu or+cfudewn46/Q/ZBdoPp185Ly7N3px+hX1wQ+zL6TdabnTphP44/UJqg40ukQF2nX4xkkq2Yc4L qE7/EvskY4XtYZ3+hb2TJGOjTn8z+oletlmnd4ayHvQD26hObxxMZuX6Zm6j6/QDYrNy1ezFbX04 vVHojesP6MPpDVdvpIcV9uH0TvugZp/QZh9OH+wdKrMX9wB6nB4ilGiX27DZwzRAu04PKiyxyz1w fcNeTpdWWIJd+2Rf2HocRllhaNi1F/qmrutQk8q0kh5ssxftUnucSqiULq2s7AVlCaPH6ZLK0TW0 RHtABVSz69Bl5bokZzmwwspRSdcR+yaV69IurJyVdJ2kb5SL2SeoXBd2naQvmkgMe4FKrAzwBH1B SEt5SbqoBHMn7Qu76JNl9EmsOGF/OGP0bawfPEVfePTG0Q+ckt6w/vCC3gina31zfQLUvol2ukY5 7cI+QH+h61SyjQ1k9kn7SbtOhbkrtvWFfqLHqejBDOyLKNgn6XFKe7CZvXFDxcrNHqeYysY2eucu nWyEXadgD3PQGyknuyjXdWqlVjh7Z8XGemyrTtEHZPZNKzeb1QarU9iDefUNlI0cua22TjmTrUlv 2Icc2yw2TuUuiuwNXULSw832H9NJ/ONvcHOfAAAAAElFTkSuQmCC Cancel-Lock: sha1:M78Ks/elGqY/YUGrHvBUuIWGR6c= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 195.159.176.226 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:215862 Archived-At: Hi, As discussed, Org urgently needs to be merged into Emacs. I have started a scratch branch with v9.0.8, although I haven’t pushed it yet. So far, I do the following changes from the Org release tarball: - Necessary white-space cleanup, required by probably some git hook to let me commit. We will have to do this on the Org repo as well. - Hardcode version in org.texi to remove dependency of "org-version.inc". - Include org-version.el (normally generated at compile-time) - Include org-loaddefs.el (normally generated at compile-time) I have a couple of questions. * Schemas ox-odt.el needs to be able to find schemas files. By default it looks into /etc/schemas and some folders computed from ‘org-odt-data-dir’, which is normally computed at compile-time. That is not so nice, and it anyway doesn’t work with some packaging systems such as "makepkg". In principal, I’d be happy to just throw the 3 Org schemas files into /etc/schemas but it already contain an schemas.xml file. Does anyone know if the two schemas files can be merged? Here’s the two files: http://orgmode.org/cgit.cgi/org-mode.git/tree/etc/schema/schemas.xml http://git.savannah.gnu.org/cgit/emacs.git/tree/etc/schema/schemas.xml I could also add a quick "fix" to ox-odt.el to look into /etc/org/schemas for now. * Compiling Org seems to mostly "just work" when compiling without the specific Org Makefiles. Achim: Are there any reasons to think that Emacs-core would need to include the Org Makefiles assuming org-version.el and org-loaddefs.el is "statically" included, as currently are for Org 8.3? The "mk" folder is not included in Emacs-core now. I assume there is still no reason to do so. Thanks, Rasmus -- Send from my Emacs