Org buffer corruption with ediff-files

Org buffer corruption with ediff-files

[Michael Brand]

[-- Attachment #1: Type: text/plain, Size: 538 bytes --]

Hi all

There seems to be a bug when ediff-files is used to compare and edit
two Org files. Reproduced with Emacs 24.4 (-Q), today's
release_8.3beta-750-gb6fce5 and these steps:

1) M-: (ediff-files "a.org" "b.org")
2) Move point to the buffer "b.org" to the line with "b"
3) M-<up> M-<up>
4) Move point back to Ediff Control Panel
5) !

The result is that an unexpected difference is left: In the buffer
"b.org" the last two lines with "f" and "g" have been removed.
org-element-use-cache set to nil does not make a difference.

Michael

[-- Attachment #2: a.org --]
[-- Type: application/octet-stream, Size: 28 bytes --]

- a
- b
- c
- d
- e
- f
- g

[-- Attachment #3: b.org --]
[-- Type: application/octet-stream, Size: 28 bytes --]

- a
- c
- d
- b
- e
- f
- g

Re: Org buffer corruption with ediff-files

[Michael Brand]

Hi Nicolas

Can you please have a look?

On Sat, Jan 24, 2015 at 1:39 PM, Michael Brand
<michael.ch.brand@gmail.com> wrote:
> Hi all
>
> There seems to be a bug when ediff-files is used to compare and edit
> two Org files. Reproduced with Emacs 24.4 (-Q), today's
> release_8.3beta-750-gb6fce5 and these steps:
>
> 1) M-: (ediff-files "a.org" "b.org")
> 2) Move point to the buffer "b.org" to the line with "b"
> 3) M-<up> M-<up>
> 4) Move point back to Ediff Control Panel
> 5) !
>
> The result is that an unexpected difference is left: In the buffer
> "b.org" the last two lines with "f" and "g" have been removed.
> org-element-use-cache set to nil does not make a difference.

Also Emacs 23.4 makes no difference.

Now I made a bisect which ends up in

    commit 56fe788c8f4ff44430a79052d4d758a0a233ac40
    Author: Nicolas Goaziou <n.goaziou@gmail.com>
    Date:   2012-05-08 09:00:18 +0200

        org-list: Fix visibility preservation

        * lisp/org-list.el (org-list-struct): Fix white spaces.
        (org-list-swap-items, org-list-send-item): Fix visibility
        preservation.

Understanding the problem or for a workaround resolve the merge
conflict of the revert seems too hard for me.

Michael

Re: Org buffer corruption with ediff-files

[Nicolas Goaziou]

Hello,

Michael Brand <michael.ch.brand@gmail.com> writes:

> Can you please have a look?
>
> On Sat, Jan 24, 2015 at 1:39 PM, Michael Brand
> <michael.ch.brand@gmail.com> wrote:
>> Hi all
>>
>> There seems to be a bug when ediff-files is used to compare and edit
>> two Org files. Reproduced with Emacs 24.4 (-Q), today's
>> release_8.3beta-750-gb6fce5 and these steps:
>>
>> 1) M-: (ediff-files "a.org" "b.org")
>> 2) Move point to the buffer "b.org" to the line with "b"
>> 3) M-<up> M-<up>
>> 4) Move point back to Ediff Control Panel
>> 5) !
>>
>> The result is that an unexpected difference is left: In the buffer
>> "b.org" the last two lines with "f" and "g" have been removed.
>> org-element-use-cache set to nil does not make a difference.
>
> Also Emacs 23.4 makes no difference.
>
> Now I made a bisect which ends up in
>
>     commit 56fe788c8f4ff44430a79052d4d758a0a233ac40
>     Author: Nicolas Goaziou <n.goaziou@gmail.com>
>     Date:   2012-05-08 09:00:18 +0200
>
>         org-list: Fix visibility preservation
>
>         * lisp/org-list.el (org-list-struct): Fix white spaces.
>         (org-list-swap-items, org-list-send-item): Fix visibility
>         preservation.
>
> Understanding the problem or for a workaround resolve the merge
> conflict of the revert seems too hard for me.

This should be fixed. Thank you for reporting it.

However, the buffer was not corrupted, but narrowed.


Regards,

-- 
Nicolas Goaziou

Re: Org buffer corruption with ediff-files

[Michael Brand]

Hi Nicolas

On Fri, Jan 30, 2015 at 12:26 AM, Nicolas Goaziou
<mail@nicolasgoaziou.fr> wrote:
> This should be fixed. Thank you for reporting it.

Fix confirmed, thank you.

Michael