* Resolving conflicts with ediff and folding
@ 2015-04-20 23:23 Suvayu Ali
2015-04-21 1:00 ` Charles C. Berry
0 siblings, 1 reply; 5+ messages in thread
From: Suvayu Ali @ 2015-04-20 23:23 UTC (permalink / raw)
To: Emacs Org mode
Hi,
Something that has been bugging me for many years now, everytime I
resolve conflicts in Org files with ediff, it's a pain. All the buffers
keep folding the outlines, hiding the conflicts. I keep going to the
buffers manually (which can be somewhat of a pain in a text terminal),
and unfolding them manually. But of course the PROPERTY drawers,
LOGBOOKs, and other DRAWERs are still folded!
And then after I have jumped through hoops, and resolved the conflicts,
I realise I could have just switched to text-mode before invoking ediff!
Is there a way where I don't have to remember to switch the major mode
before invoking ediff[1]? Or maybe an ediff experience where the
buffers are forced to unhide text. I guess it should be possible to
just temporarily remove all overlays or invisible properties.
Any thoughts, ideas?
Footnotes:
[1] I guess I can advice ediff*, but compiling a comprehensive list of
all such functions might be bit of a chore.
--
Suvayu
Open source is the future. It sets us free.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Resolving conflicts with ediff and folding
2015-04-20 23:23 Resolving conflicts with ediff and folding Suvayu Ali
@ 2015-04-21 1:00 ` Charles C. Berry
2015-04-23 14:14 ` J. David Boyd
0 siblings, 1 reply; 5+ messages in thread
From: Charles C. Berry @ 2015-04-21 1:00 UTC (permalink / raw)
To: Suvayu Ali; +Cc: Emacs Org mode
On Tue, 21 Apr 2015, Suvayu Ali wrote:
> Hi,
>
> Something that has been bugging me for many years now, everytime I
> resolve conflicts in Org files with ediff, it's a pain. All the buffers
> keep folding the outlines, hiding the conflicts. I keep going to the
> buffers manually (which can be somewhat of a pain in a text terminal),
> and unfolding them manually. But of course the PROPERTY drawers,
> LOGBOOKs, and other DRAWERs are still folded!
>
> And then after I have jumped through hoops, and resolved the conflicts,
> I realise I could have just switched to text-mode before invoking ediff!
>
> Is there a way where I don't have to remember to switch the major mode
> before invoking ediff[1]? Or maybe an ediff experience where the
> buffers are forced to unhide text. I guess it should be possible to
> just temporarily remove all overlays or invisible properties.
>
> Any thoughts, ideas?
Did you see this thread:
http://lists.gnu.org/archive/html/emacs-orgmode/2013-04/msg00400.html
??
HTH,
Chuck
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Resolving conflicts with ediff and folding
2015-04-21 1:00 ` Charles C. Berry
@ 2015-04-23 14:14 ` J. David Boyd
[not found] ` <gjub383rgce1.fsf-JUvT7rMoG4SqrIjp+dE73DJtLkR7yuzc@public.gmane.org>
0 siblings, 1 reply; 5+ messages in thread
From: J. David Boyd @ 2015-04-23 14:14 UTC (permalink / raw)
To: emacs-orgmode
"Charles C. Berry" <ccberry@ucsd.edu> writes:
> On Tue, 21 Apr 2015, Suvayu Ali wrote:
>
>> Hi,
>>
>> Something that has been bugging me for many years now, everytime I
>> resolve conflicts in Org files with ediff, it's a pain. All the buffers
>> keep folding the outlines, hiding the conflicts. I keep going to the
>> buffers manually (which can be somewhat of a pain in a text terminal),
>> and unfolding them manually. But of course the PROPERTY drawers,
>> LOGBOOKs, and other DRAWERs are still folded!
>>
>> And then after I have jumped through hoops, and resolved the conflicts,
>> I realise I could have just switched to text-mode before invoking ediff!
>>
>> Is there a way where I don't have to remember to switch the major mode
>> before invoking ediff[1]? Or maybe an ediff experience where the
>> buffers are forced to unhide text. I guess it should be possible to
>> just temporarily remove all overlays or invisible properties.
>>
>> Any thoughts, ideas?
>
> Did you see this thread:
>
> http://lists.gnu.org/archive/html/emacs-orgmode/2013-04/msg00400.html
>
> ??
>
> HTH,
>
> Chuck
That't what I was going to say. I added that to my setup long ago, and it has
been working fine since then. I don't ediff all that often, but when I do it
certainly helps.
Dave
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Resolving conflicts with ediff and folding
[not found] ` <gjub383rgce1.fsf-JUvT7rMoG4SqrIjp+dE73DJtLkR7yuzc@public.gmane.org>
@ 2015-04-28 9:43 ` Sebastien Vauban
2015-05-04 6:23 ` iemacs
0 siblings, 1 reply; 5+ messages in thread
From: Sebastien Vauban @ 2015-04-28 9:43 UTC (permalink / raw)
To: J. David Boyd; +Cc: emacs-orgmode-mXXj517/zsQ
J. David Boyd wrote:
> "Charles C. Berry" <ccberry-XkckGZ689+c@public.gmane.org> writes:
>> On Tue, 21 Apr 2015, Suvayu Ali wrote:
>>>
>>> Something that has been bugging me for many years now, everytime
>>> I resolve conflicts in Org files with ediff, it's a pain. All the
>>> buffers keep folding the outlines, hiding the conflicts. I keep
>>> going to the buffers manually (which can be somewhat of a pain in
>>> a text terminal), and unfolding them manually. But of course the
>>> PROPERTY drawers, LOGBOOKs, and other DRAWERs are still folded!
>>>
>>> And then after I have jumped through hoops, and resolved the
>>> conflicts, I realise I could have just switched to text-mode before
>>> invoking ediff!
>>>
>>> Is there a way where I don't have to remember to switch the major
>>> mode before invoking ediff[1]? Or maybe an ediff experience where
>>> the buffers are forced to unhide text. I guess it should be
>>> possible to just temporarily remove all overlays or invisible
>>> properties.
>>>
>>> Any thoughts, ideas?
>>
>> Did you see this thread:
>> http://lists.gnu.org/archive/html/emacs-orgmode/2013-04/msg00400.html
>> ??
>
> That't what I was going to say. I added that to my setup long ago,
> and it has been working fine since then. I don't ediff all that
> often, but when I do it certainly helps.
The only (tiny) problem is that the `truncate-lines' and `visible-mode'
settings stay in the buffer after the Ediff session -- while one would
love to get back to the original settings of the buffer.c
Best regards,
Seb
--
Sebastien Vauban
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Resolving conflicts with ediff and folding
2015-04-28 9:43 ` Sebastien Vauban
@ 2015-05-04 6:23 ` iemacs
0 siblings, 0 replies; 5+ messages in thread
From: iemacs @ 2015-05-04 6:23 UTC (permalink / raw)
To: Sebastien Vauban, J. David Boyd; +Cc: emacs-orgmode
[-- Attachment #1: Type: text/plain, Size: 1910 bytes --]
I have the following lisp code can do the trick:
(add-hook 'ediff-quit-hook
(lambda ()
(cond ((eq major-mode 'org-mode)
(visible-mode 0)))))
--
Tian Qiu
On Tue, Apr 28, 2015 at 5:43 PM Sebastien Vauban <sva-news@mygooglest.com>
wrote:
> J. David Boyd wrote:
> > "Charles C. Berry" <ccberry@ucsd.edu> writes:
> >> On Tue, 21 Apr 2015, Suvayu Ali wrote:
> >>>
> >>> Something that has been bugging me for many years now, everytime
> >>> I resolve conflicts in Org files with ediff, it's a pain. All the
> >>> buffers keep folding the outlines, hiding the conflicts. I keep
> >>> going to the buffers manually (which can be somewhat of a pain in
> >>> a text terminal), and unfolding them manually. But of course the
> >>> PROPERTY drawers, LOGBOOKs, and other DRAWERs are still folded!
> >>>
> >>> And then after I have jumped through hoops, and resolved the
> >>> conflicts, I realise I could have just switched to text-mode before
> >>> invoking ediff!
> >>>
> >>> Is there a way where I don't have to remember to switch the major
> >>> mode before invoking ediff[1]? Or maybe an ediff experience where
> >>> the buffers are forced to unhide text. I guess it should be
> >>> possible to just temporarily remove all overlays or invisible
> >>> properties.
> >>>
> >>> Any thoughts, ideas?
> >>
> >> Did you see this thread:
> >> http://lists.gnu.org/archive/html/emacs-orgmode/2013-04/msg00400.html
> >> ??
> >
> > That't what I was going to say. I added that to my setup long ago,
> > and it has been working fine since then. I don't ediff all that
> > often, but when I do it certainly helps.
>
> The only (tiny) problem is that the `truncate-lines' and `visible-mode'
> settings stay in the buffer after the Ediff session -- while one would
> love to get back to the original settings of the buffer.c
>
> Best regards,
> Seb
>
> --
> Sebastien Vauban
>
>
[-- Attachment #2: Type: text/html, Size: 2791 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-05-04 6:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-20 23:23 Resolving conflicts with ediff and folding Suvayu Ali
2015-04-21 1:00 ` Charles C. Berry
2015-04-23 14:14 ` J. David Boyd
[not found] ` <gjub383rgce1.fsf-JUvT7rMoG4SqrIjp+dE73DJtLkR7yuzc@public.gmane.org>
2015-04-28 9:43 ` Sebastien Vauban
2015-05-04 6:23 ` iemacs
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).