From: Michael Brand <michael.ch.brand@gmail.com>
To: Nicolas Goaziou <n.goaziou@gmail.com>
Cc: Org Mode <emacs-orgmode@gnu.org>
Subject: Re: Org buffer corruption with ediff-files
Date: Thu, 29 Jan 2015 19:22:10 +0100 [thread overview]
Message-ID: <CALn3zojuM7UC-qUjKvbxxLxCR-NgkHCiPUwjqCUNAFiEiTU8nA@mail.gmail.com> (raw)
In-Reply-To: <CALn3zogcFDONEsCRFcY4V-WJq3bQMVaFyWVOXA7ax=AAegD-ww@mail.gmail.com>
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
next prev parent reply other threads:[~2015-01-29 18:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-24 12:39 Org buffer corruption with ediff-files Michael Brand
2015-01-29 18:22 ` Michael Brand [this message]
2015-01-29 23:26 ` Nicolas Goaziou
2015-01-30 6:13 ` Michael Brand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CALn3zojuM7UC-qUjKvbxxLxCR-NgkHCiPUwjqCUNAFiEiTU8nA@mail.gmail.com \
--to=michael.ch.brand@gmail.com \
--cc=emacs-orgmode@gnu.org \
--cc=n.goaziou@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).