* Org buffer corruption with ediff-files
@ 2015-01-24 12:39 Michael Brand
2015-01-29 18:22 ` Michael Brand
0 siblings, 1 reply; 4+ messages in thread
From: Michael Brand @ 2015-01-24 12:39 UTC (permalink / raw)
To: Org Mode
[-- 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Org buffer corruption with ediff-files
2015-01-24 12:39 Org buffer corruption with ediff-files Michael Brand
@ 2015-01-29 18:22 ` Michael Brand
2015-01-29 23:26 ` Nicolas Goaziou
0 siblings, 1 reply; 4+ messages in thread
From: Michael Brand @ 2015-01-29 18:22 UTC (permalink / raw)
To: Nicolas Goaziou; +Cc: Org Mode
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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: Org buffer corruption with ediff-files
2015-01-29 18:22 ` Michael Brand
@ 2015-01-29 23:26 ` Nicolas Goaziou
2015-01-30 6:13 ` Michael Brand
0 siblings, 1 reply; 4+ messages in thread
From: Nicolas Goaziou @ 2015-01-29 23:26 UTC (permalink / raw)
To: Michael Brand; +Cc: Org Mode
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-01-30 6:13 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-24 12:39 Org buffer corruption with ediff-files Michael Brand
2015-01-29 18:22 ` Michael Brand
2015-01-29 23:26 ` Nicolas Goaziou
2015-01-30 6:13 ` Michael Brand
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).