Re: [O] Org release 7.8.04 (BUGFIX-only release)

2012-03-19 Thread Bastien
Hi Achim, Achim Gratz strom...@nexgo.de writes: Curses... here are the two patches Thanks a lot. Can you tell me how you created this patches and what is the commit maint and master will correspond to after we apply it? Are there patches that have been applied and should be reapplied in

Re: [O] Org release 7.8.04 (BUGFIX-only release)

2012-03-19 Thread Achim Gratz
Bastien b...@altern.org writes: Thanks a lot. Can you tell me how you created this patches and what is the commit maint and master will correspond to after we apply it? I've sent you a mail with the details. Are there patches that have been applied and should be reapplied in case we use

Re: [O] Org release 7.8.04 (BUGFIX-only release)

2012-03-18 Thread Bastien
Achim Gratz strom...@nexgo.de writes: Bastien b...@altern.org writes: There was something wrong in the process of releasing 7.8.04 (the release relied on the wrong branch.) I released Org 7.8.05. Maint still needs to be merged back into master, otherwise master picks up 7.8.04 as the

Re: [O] Org release 7.8.04 (BUGFIX-only release)

2012-03-18 Thread Achim Gratz
Bastien b...@altern.org writes: I released Org 7.8.05. Maint still needs to be merged back into master, otherwise master picks up 7.8.04 as the release version. Done, thanks for the heads up. Well, all this manual reverting messed up master quite royally. I haven't checked maint, but

Re: [O] Org release 7.8.04 (BUGFIX-only release)

2012-03-18 Thread Achim Gratz
Achim Gratz strom...@nexgo.de writes: Well, all this manual reverting messed up master quite royally. I haven't checked maint, but things might be a bit easier there. I'm currently trying to re-trace what master and maint should have been and make a patch on top of the mangled versions...

Re: [O] Org release 7.8.04 (BUGFIX-only release)

2012-03-18 Thread Achim Gratz
Achim Gratz strom...@nexgo.de writes: Here are two patches to clean up master and maint to where they should be (IMHO, please check). Needless to say, you _will_ have to do another release with these fixes. These aren't the patches you're looking for... I have sent the correct files already,

Re: [O] Org release 7.8.04 (BUGFIX-only release)

2012-03-18 Thread Martyn Jago
Hi Since all the `errors' are whitespace it may be better to work around the release? Best Martyn Achim Gratz strom...@nexgo.de writes: Achim Gratz strom...@nexgo.de writes: Well, all this manual reverting messed up master quite royally. I haven't checked maint, but things might be a bit

Re: [O] Org release 7.8.04 (BUGFIX-only release)

2012-03-18 Thread Achim Gratz
Martyn Jago martyn.j...@btinternet.com writes: Since all the `errors' are whitespace it may be better to work around the release? Nope, Gnus was sending the message before it was correctly composed. Since Gmane doesn't seem to want to post them to the list (or it does take wuite a bit onger

Re: [O] Org release 7.8.04 (BUGFIX-only release)

2012-03-17 Thread Bastien
Hi all, Bastien b...@altern.org writes: I have just released Org 7.8.04 -- a BUGFIX-only release. There was something wrong in the process of releasing 7.8.04 (the release relied on the wrong branch.) I released Org 7.8.05. Thanks, -- Bastien

Re: [O] Org release 7.8.04 (BUGFIX-only release)

2012-03-17 Thread Achim Gratz
Bastien b...@altern.org writes: There was something wrong in the process of releasing 7.8.04 (the release relied on the wrong branch.) I released Org 7.8.05. Maint still needs to be merged back into master, otherwise master picks up 7.8.04 as the release version. Also, you need to fix

[O] Org release 7.8.04 (BUGFIX-only release)

2012-03-16 Thread Bastien
Hi all, I have just released Org 7.8.04 -- a BUGFIX-only release. This is the version that we will merge into Emacs' trunk, and the one that will probably be shipped with Emacs 24.1 (soon to be released.) Org 7.8.04 does not contains the latest git version of the master branch, only that of