From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Brand <michael.ch.brand@gmail.com>
Subject: Org buffer corruption with ediff-files
Date: Sat, 24 Jan 2015 13:39:26 +0100
Message-ID: <CALn3zogcFDONEsCRFcY4V-WJq3bQMVaFyWVOXA7ax=AAegD-ww@mail.gmail.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary=001a11c1337015c7c3050d65321e
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:50921)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <michael.ch.brand@gmail.com>) id 1YEzzs-0006NE-Dq
	for emacs-orgmode@gnu.org; Sat, 24 Jan 2015 07:39:29 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <michael.ch.brand@gmail.com>) id 1YEzzr-0003ZF-EW
	for emacs-orgmode@gnu.org; Sat, 24 Jan 2015 07:39:28 -0500
Received: from mail-qa0-x22b.google.com ([2607:f8b0:400d:c00::22b]:58501)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <michael.ch.brand@gmail.com>) id 1YEzzr-0003ZA-AQ
	for emacs-orgmode@gnu.org; Sat, 24 Jan 2015 07:39:27 -0500
Received: by mail-qa0-f43.google.com with SMTP id v10so1506543qac.2
	for <emacs-orgmode@gnu.org>; Sat, 24 Jan 2015 04:39:26 -0800 (PST)
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: Org Mode <emacs-orgmode@gnu.org>

--001a11c1337015c7c3050d65321e
Content-Type: text/plain; charset=UTF-8

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

--001a11c1337015c7c3050d65321e
Content-Type: application/octet-stream; name="a.org"
Content-Disposition: attachment; filename="a.org"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_i5azah670

LSBhCi0gYgotIGMKLSBkCi0gZQotIGYKLSBnCg==
--001a11c1337015c7c3050d65321e
Content-Type: application/octet-stream; name="b.org"
Content-Disposition: attachment; filename="b.org"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_i5azatdf1

LSBhCi0gYwotIGQKLSBiCi0gZQotIGYKLSBnCg==
--001a11c1337015c7c3050d65321e--