Merged Org 7.7

Merged Org 7.7

[Bastien]

Dear all,

I've just merged Org version 7.7 to Emacs trunk.

Org was not updated since version 7.4 -- this is entirely
my fault, as I took over maintainership of Org after this
release.  But I needed some time to feel confident about
the best way to make this merge happen.

This is a *huge* commit.  I have been extra careful while
adding the proper ChangeLogs.  If you find anything wrong
in the ChangeLog entries, please feel free to fix it.

I will be off until August, 10th.

Thanks,

-- 
 Bastien

Re: Merged Org 7.7

[Glenn Morris]

You've clobbered my changes to the copyright years in every org file.
You've also re-added the arch tags that were removed.

I really, really suggest that you don't put the Version: header in every
single file, then you won't need to update every single file in every
single release.

Re: Merged Org 7.7

[Glenn Morris]

Also, you included ChangeLog entries for etc/refcards/orgcard.tex
and doc/misc/org.texi, but no changes were committed to those files.

Re: Merged Org 7.7

[Glenn Morris]

The following people have changes that are not marked as tiny, but they
don't seem (at first sight) to have copyright assignments. It's possible
that they have them, but the file copyright.list does not show them, AFAICS.

Achim Gratz
Deech
Ethan Ligon
Jan Seeger
Jason Dunsmore
Nick Dokos
Pieter Praet
Remi Vanicat
Robert P. Goldman
Sean O'Halpin
Suvayu Ali
Sebastien Delafond


The following ChangeLog entries seem broken/incomplete:


No description of which files were changed:

2011-07-28  Suvayu Ali  <fatkasuvayu+linux@gmail.com>

            * Mention use of keywords like multicolumn and float

            * Remove previous mention of hack with placement option as per
              comments on the mailing list. The hack is better suited
              for Worg.

2011-07-28  Ethan Ligon  <ligon@are.berkeley.edu>

            * Illustration of bug in html export - This has a space after the

Bogus/incomplete:

2011-07-28  Bastien Guerry  <bzg@gnu.org>

            * 2011
            ** 2011-02 monthname
            *** 2011-02-13 dayname


Associated files not in Emacs:

2011-07-28  David Maus  <dmaus@ictsoc.de>

            * test-org-html.el (test-org-html/export-link-alist): New
            variable. Abstract link export test definition.
2011-07-28  David Maus  <dmaus@ictsoc.de>

            * org-test.el (org-test-strip-text-props): New function.
              Strip text properties.


Missing `.el':

2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>

            * org-exp (org-export-preprocess-string): normalize
              footnotes before marking lists ending.

2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>

            * org-list (org-cycle-item-indentation): do not break an

Re: Merged Org 7.7

[Bastien]

Hi Glenn,

Glenn Morris <rgm@gnu.org> writes:

> The following people have changes that are not marked as tiny, but they
> don't seem (at first sight) to have copyright assignments. It's possible
> that they have them, but the file copyright.list does not show them,
> AFAICS.

Thanks for this careful check.

> Achim Gratz

I'm checking the status of Achim's FSF assignment right now.

> Deech
> Ethan Ligon
> Jan Seeger
> Jason Dunsmore
> Nick Dokos

Tiny change.

> Pieter Praet

I'm checking the status of Pieter's FSF assignment right now.

> Remi Vanicat
> Robert P. Goldman
> Sean O'Halpin
> Suvayu Ali
> Sebastien Delafond

Tiny change.

I have just added "(tiny change)" where relevant in lisp/org/ChangeLog.

Thanks again,

-- 
 Bastien

Re: Merged Org 7.7

[Bastien]

Glenn Morris <rgm@gnu.org> writes:

> The following ChangeLog entries seem broken/incomplete:

Fixed, thanks!

-- 
 Bastien

Re: Merged Org 7.7

[Glenn Morris]

I noticed another couple of org/ChangeLog issues:


There are several entries for files that are not in Emacs:
test-org-table.el.el, org-colview-xemacs.el, org-lparse.el, org-toc.el,
org-contacts.el (and org-contacts-wl.el), org-exp-bibtex.el.

There's no entry for the removal of org-complete.el.


This entry is a misplaced and misattributed duplicate of
of a 2009-07-14 entry from lisp/ChangeLog.15:

2011-07-28  Bastien Guerry  <bzg@gnu.org>

            * simple.el (mail-user-agent): Default to the


No details of what files were changed:

2011-07-28  Eric S Fraga  <e.fraga@ucl.ac.uk>

            * Allow for a different markup for inactive time stamps on
              latex export


Incorrect "lisp/" prefix:

2011-07-28  Ethan Ligon  <ligon@are.berkeley.edu>  (tiny change)

            * lisp/org-html.el (org-html-export-list-line): Fix regexp
[...]
            * lisp/org-docbook.el (org-docbook-export-list-line): Fix

Re: Merged Org 7.7

[Bastien]

Glenn Morris <rgm@gnu.org> writes:

> I noticed another couple of org/ChangeLog issues:

Fixed, thanks.

-- 
 Bastien

Re: Merged Org 7.7

[Bastien]

Glenn Morris <rgm@gnu.org> writes:

> Also, you included ChangeLog entries for etc/refcards/orgcard.tex
> and doc/misc/org.texi, but no changes were committed to those files.

Fixed, thanks!

-- 
 Bastien

Re: Merged Org 7.7

[Glenn Morris]

Bastien wrote:

> Glenn Morris <rgm@gnu.org> writes:
>
>> Also, you included ChangeLog entries for etc/refcards/orgcard.tex
>> and doc/misc/org.texi, but no changes were committed to those files.
>
> Fixed, thanks!

Thanks. Please could you re-date (from 2011-07-28 to 2011-08-15) the
associated ChangeLog entries, and move them to the right places in the
files.

Re: Merged Org 7.7

[Bastien]

Glenn Morris <rgm@gnu.org> writes:

> Thanks. Please could you re-date (from 2011-07-28 to 2011-08-15) the
> associated ChangeLog entries, and move them to the right places in the
> files.

Done.

-- 
 Bastien

Re: Merged Org 7.7

[Eduard Wiebe]

Glenn Morris <rgm@gnu.org> writes:

> Also, you included ChangeLog entries for etc/refcards/orgcard.tex
> and doc/misc/org.texi, but no changes were committed to those files.
>

It seems that orgmode docu (org.texi) also not in sync.

M-x org-version
Org-mode version 7.7

C-x C-f doc/misc/org.texi
@settitle The Org Manual

@set VERSION 7.4
@set DATE December 2010

-- 
Eduard Wiebe

Re: Merged Org 7.7

[Bastien]

Eduard Wiebe <usenet@pusto.de> writes:

> Glenn Morris <rgm@gnu.org> writes:
>
>> Also, you included ChangeLog entries for etc/refcards/orgcard.tex
>> and doc/misc/org.texi, but no changes were committed to those files.
>
> It seems that orgmode docu (org.texi) also not in sync.

Yes.  I have fixed this.

-- 
 Bastien

Re: Merged Org 7.7

[Bastien]

Hi Glenn,

Glenn Morris <rgm@gnu.org> writes:

> You've clobbered my changes to the copyright years in every org file.

I somehow missed this.

Can you point me to the relevant mail on emacs-diff?

> You've also re-added the arch tags that were removed.

I will remove them in the next merge (it's already done in Org's git
repository), sorry for this.

Best,

-- 
 Bastien

Re: Merged Org 7.7

[Glenn Morris]

Bastien wrote:

>> You've clobbered my changes to the copyright years in every org file.
>
> I somehow missed this.
>
> Can you point me to the relevant mail on emacs-diff?

Sure.

http://lists.gnu.org/archive/html/emacs-diffs/2011-08/msg00062.html

It's totally unhelpful, because Org merges are so massive.

You did the same thing in today's merge of the docs:

http://lists.gnu.org/archive/html/emacs-diffs/2011-08/msg00157.html

  -Copyright @copyright{} 2004-2011  Free Software Foundation, Inc.
  +Copyright @copyright{} 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
  +Free Software Foundation, Inc.

  [...]

  +% arch-tag: 139f6750-5cfc-49ca-92b5-237fe5795290

Re: Merged Org 7.7

[Glenn Morris]

Glenn Morris wrote:

>> Can you point me to the relevant mail on emacs-diff?
>
> Sure.
>
> http://lists.gnu.org/archive/html/emacs-diffs/2011-08/msg00062.html

Oh, maybe you meant _my_ change.

http://lists.gnu.org/archive/html/emacs-diffs/2011-08/msg00062.html
http://lists.gnu.org/archive/html/emacs-diffs/2011-01/msg00156.html

which are also unhelpful. There may have been other changes as well.
You can find them with bzr log.

But surely the right way to do it is to look at the diff before you do
the Org merge and see that it doesn't have anything unexpected.

 bzr diff -r 105336..105337

eg

--- lisp/org/ob-C.el    2011-01-25 04:08:28 +0000
+++ lisp/org/ob-C.el    2011-07-28 15:13:49 +0000
@@ -1,11 +1,11 @@
 ;;; ob-C.el --- org-babel functions for C and similar languages
 
-;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2010  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.4
+;; Version: 7.7


Obviously the problem is that the diff is so large that it is very
difficult to check.

Re: Merged Org 7.7

[Glenn Morris]

Glenn Morris wrote:

> But surely the right way to do it is to look at the diff before you do
> the Org merge and see that it doesn't have anything unexpected.

And, rather than just copying the files from Org over the files in Emacs
(which is what I guess you are doing now), start by generating a diff
between current-version-of-Org and last-version-you-merged-to-Emacs, and
try to apply it to Emacs.

Re: Merged Org 7.7

[Bastien]

Glenn Morris <rgm@gnu.org> writes:

> Glenn Morris wrote:
>
>> But surely the right way to do it is to look at the diff before you do
>> the Org merge and see that it doesn't have anything unexpected.
>
> And, rather than just copying the files from Org over the files in Emacs
> (which is what I guess you are doing now), start by generating a diff
> between current-version-of-Org and last-version-you-merged-to-Emacs, and
> try to apply it to Emacs.

I will do this for future merges, thanks for the idea.

-- 
 Bastien

Re: Merged Org 7.7

[Bastien]

Glenn Morris <rgm@gnu.org> writes:

>> http://lists.gnu.org/archive/html/emacs-diffs/2011-08/msg00062.html
>
> Oh, maybe you meant _my_ change.

Yes.  I'm reading emacs-diff and I didn't see the mail with your changes
about the copyright years. 

> http://lists.gnu.org/archive/html/emacs-diffs/2011-08/msg00062.html
> http://lists.gnu.org/archive/html/emacs-diffs/2011-01/msg00156.html

These emails are not the one about _your_ change, or do I miss
something?

-- 
 Bastien

Re: Merged Org 7.7

[Glenn Morris]

Bastien wrote:

>> http://lists.gnu.org/archive/html/emacs-diffs/2011-08/msg00062.html
>> http://lists.gnu.org/archive/html/emacs-diffs/2011-01/msg00156.html
>
> These emails are not the one about _your_ change, or do I miss
> something?

Yes, the change to copyright years was made in the emacs-23 branch by
me, then merged to trunk by Stefan, so I believe the last one represents
the relevant change. But perhaps I made other smaller changes after that
to correct issues, I cannot remember. bzr log can show you all the
revisions that affected a particular file.

But I don't think that's the best way to do it. If you look at
the diff corresponding to your initial merge of 7.7, and the more recent
one for the etc and doc/misc directories, and just revert all the
changes to the Copyright lines, that ought to fix it. Eg as I said

  -Copyright @copyright{} 2004-2011  Free Software Foundation, Inc.
  +Copyright @copyright{} 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
  +Free Software Foundation, Inc.

Re: Merged Org 7.7

[Bastien]

Glenn Morris <rgm@gnu.org> writes:

> Bastien wrote:
>
>>> http://lists.gnu.org/archive/html/emacs-diffs/2011-08/msg00062.html
>>> http://lists.gnu.org/archive/html/emacs-diffs/2011-01/msg00156.html
>>
>> These emails are not the one about _your_ change, or do I miss
>> something?
>
> Yes, the change to copyright years was made in the emacs-23 branch by
> me, then merged to trunk by Stefan, so I believe the last one represents
> the relevant change. 

Ah, thanks.  It was hard to tell, because the subject of the email
("Merge from...") was not describing the change, and the content of
the email didn't let me spot it.

> But perhaps I made other smaller changes after that
> to correct issues, I cannot remember. 

Carsten and I have been carefully watching emacs-diffs so far, so I 
am pretty confident the Org git repo contains changes from Emacs.

Thanks again for your close attention to these problems!

Best,

-- 
 Bastien

Re: Merged Org 7.7

[Glenn Morris]

I fixed this one myself (plus some other things I noticed, in a separate
commit).

Re: Merged Org 7.7

[Bastien]

Glenn Morris <rgm@gnu.org> writes:

> I fixed this one myself (plus some other things I noticed, in a separate
> commit).

Thanks!

-- 
 Bastien

Re: Merged Org 7.7

[Bastien]

Glenn Morris <rgm@gnu.org> writes:

> I really, really suggest that you don't put the Version: header in every
> single file, then you won't need to update every single file in every
> single release.

I think leaving the "Version" information in each header lets users make
sure the various org-*.el files are in sync with the main org.el file --
whether those files are from Emacs or not.

Or am I missing something?

-- 
 Bastien

Re: Merged Org 7.7

[Paul Eggert]

On 08/15/2011 08:05 AM, Bastien wrote:
> leaving the "Version" information in each header lets users make
> sure the various org-*.el files are in sync

> Or am I missing something?

Yes, the "Version:" header is more trouble than it's worth.
A user will rarely if ever check all their org files to see whether
they're in sync, and there are other ways to do this check if needed,
so the benefit of the header is quite small.  On the other hand, the
header costs developers valuable time, as they have to navigate through
spurious differences due entirely to these relatively-useless "Version:"
headers when they review changes.

Glenn's suggestion is a good one.  Emacs files brought in from other
sources do just fine without version headers, and Org should do the same.

Re: Merged Org 7.7

[Bastien]

Hi Paul,

thanks for the feedback.

Paul Eggert <eggert@cs.ucla.edu> writes:

> Glenn's suggestion is a good one.  Emacs files brought in from other
> sources do just fine without version headers, and Org should do the
> same.

I removed the "Version" header in Org files in the Org git repo.  Only
org.el still uses such a header.  This will appear in the next Org>Emacs
merge.

Thanks,

-- 
 Bastien

Re: Merged Org 7.7

[Bastien]

Glenn Morris <rgm@gnu.org> writes:

> You've also re-added the arch tags that were removed.

Fixed, thanks.

-- 
 Bastien