From: Rasmus <rasmus@gmx.us>
To: emacs-devel@gnu.org
Cc: bzg@gnu.org, kyle@kyleam.com, Stromeko@Nexgo.DE, michael.albinus@gmx.de
Subject: org-merger questions
Date: Wed, 21 Jun 2017 17:09:06 +0200 [thread overview]
Message-ID: <874lv9fkdp.fsf@gmx.us> (raw)
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 <Emacs>/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
<Emacs>/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
<Emacs>/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
next reply other threads:[~2017-06-21 15:09 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-21 15:09 Rasmus [this message]
2017-06-21 15:23 ` org-merger questions Kaushal Modi
2017-06-21 16:16 ` Bastien Guerry
2017-06-22 10:31 ` Rasmus
2017-06-22 10:46 ` Yuri Khan
2017-06-22 16:01 ` Kyle Meyer
2017-06-22 18:11 ` Kyle Meyer
2017-06-23 9:04 ` Rasmus
2017-06-23 14:19 ` Kyle Meyer
2017-06-23 8:47 ` Rasmus
2017-06-23 14:30 ` Kyle Meyer
2017-06-23 14:37 ` Rasmus
2017-06-25 16:10 ` Kaushal Modi
2017-06-29 8:54 ` Rasmus
2017-06-29 9:12 ` Bastien Guerry
2017-06-29 16:13 ` John Wiegley
2017-07-03 7:19 ` Bastien
2017-07-03 15:56 ` Emacs master now updated to Org 9.0.9 (Was: org-merger questions) Kaushal Modi
2017-07-04 7:54 ` Emacs master now updated to Org 9.0.9 Bastien Guerry
2017-07-13 0:36 ` numbchild
2017-10-02 9:25 ` org-merger questions Bastien Guerry
2017-10-02 9:41 ` Rasmus
2017-10-02 9:46 ` Rasmus
2017-10-02 16:05 ` Eli Zaretskii
2017-10-11 22:31 ` Org mode update missing in NEWS (Was: Re: org-merger questions) Kaushal Modi
2017-10-12 7:54 ` Eli Zaretskii
2017-10-15 10:37 ` Org mode update missing in NEWS Rasmus
2017-06-21 15:27 ` org-merger questions Kyle Meyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=874lv9fkdp.fsf@gmx.us \
--to=rasmus@gmx.us \
--cc=Stromeko@Nexgo.DE \
--cc=bzg@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=kyle@kyleam.com \
--cc=michael.albinus@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).