From: Rasmus <rasmus@gmx.us>
To: emacs-devel@gnu.org
Subject: Re: org-merger questions
Date: Fri, 23 Jun 2017 10:47:04 +0200 [thread overview]
Message-ID: <87d19vozuf.fsf@gmx.us> (raw)
In-Reply-To: 87mv906mfl.fsf@kyleam.com
Hi Kyle,
Thanks for carefully looking into this.
>> I had to do a few whitespace cleanup to be able to commit. We should
>> backport those, I guess.
>
> Hmm, I was hoping I had already caught most of them, but maybe the
> issues you encountered were in the few files changed in
> scratch/org-mode-merge that I didn't look at. I only checked
> lisp/org/*.el, lisp/doc/misc/org.texi, and etc/refcards/orgcard.tex.
Perhaps I did something wrong. I used release 9.0.9, not the emacs-sync
branch. So if there were additional changes on the emacs-sync branch on
top of 9.0.9 I won’t have picked them up. This is the version I used:
http://orgmode.org/cgit.cgi/org-mode.git/tag/?h=emacs-sync&id=release_9.0.9
> A few problems in scratch/org-mode-merge:
>
> * scratch/org-mode-merge reverts Emacs-specific changes in
> etc/refcards/orgcard.tex. This same mistake was made in a previous
> sync and fixed with Emacs's e90dec2be1. Since then, there have been
> additional Emacs-specific changes added to orgcard.tex, and these
> are all included in Org's emacs-sync branch.
See above.
So do you think it’s best to just cherry-pick these changes back?
> * I made the mistake of not looking at ORG-NEWS for backports, so
> scratch/org-mode-merge is reverting a few Emacs commits here. I'll
> backport these, and I can also add your ORG-NEWS formatting changes
> to the Org repo.
Note that the formatting itself is a bit weird in ORG-NEWS. At least on
my normal Emacs setup it’s always changed when opened. The only issue was
some dangling whitespace at the end of a couple of lines, which the Emacs
commit hook didn’t like.
> * The copyright years in Org's etc/styles/README have not been kept up
> to date, so scratch/org-mode-merge is overwriting the updated years
> in Emacs's etc/org/README.
OK
> And a question:
>
> * Should we include the "@set DATE ..." when we replace "@include
> org-version.inc" in Emacs's org.texi? It doesn't seem like we have
> in the past (e.g., in Emacs's 6f66f53f65).
I don’t know. I think we should be bound by the Emacs practice, not what
was done in the last sync aeon ago. Principally, I think documents should
be dated. I don’t know if it’s right in an Emacs context, as it carries
its own date. idlwave.texi and elisp.texi are the only other dated texi
files.
Rasmus
--
Together we will make the possible totalllly impossible!
next prev parent reply other threads:[~2017-06-23 8:47 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-21 15:09 org-merger questions Rasmus
2017-06-21 15:23 ` 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 [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87d19vozuf.fsf@gmx.us \
--to=rasmus@gmx.us \
--cc=emacs-devel@gnu.org \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.