From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Brand <michael.ch.brand@gmail.com>
Subject: Re: Org buffer corruption with ediff-files
Date: Thu, 29 Jan 2015 19:22:10 +0100
Message-ID: <CALn3zojuM7UC-qUjKvbxxLxCR-NgkHCiPUwjqCUNAFiEiTU8nA@mail.gmail.com>
References: <CALn3zogcFDONEsCRFcY4V-WJq3bQMVaFyWVOXA7ax=AAegD-ww@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36050)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <michael.ch.brand@gmail.com>) id 1YGtjM-0000OC-CS
	for emacs-orgmode@gnu.org; Thu, 29 Jan 2015 13:22:17 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <michael.ch.brand@gmail.com>) id 1YGtjG-0008Da-Tt
	for emacs-orgmode@gnu.org; Thu, 29 Jan 2015 13:22:16 -0500
Received: from mail-qg0-x230.google.com ([2607:f8b0:400d:c04::230]:36008)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <michael.ch.brand@gmail.com>) id 1YGtjG-0008DI-Q1
	for emacs-orgmode@gnu.org; Thu, 29 Jan 2015 13:22:10 -0500
Received: by mail-qg0-f48.google.com with SMTP id z60so32043006qgd.7
	for <emacs-orgmode@gnu.org>; Thu, 29 Jan 2015 10:22:10 -0800 (PST)
In-Reply-To: <CALn3zogcFDONEsCRFcY4V-WJq3bQMVaFyWVOXA7ax=AAegD-ww@mail.gmail.com>
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: Nicolas Goaziou <n.goaziou@gmail.com>
Cc: Org Mode <emacs-orgmode@gnu.org>

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