Re: [O] Resolving conflicts with ediff and folding

2015-05-04 Thread iemacs
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-n...@mygooglest.com wrote: J. David Boyd wrote:

Re: [O] Resolving conflicts with ediff and folding

2015-04-28 Thread Sebastien Vauban
J. David Boyd wrote: Charles C. Berry ccbe...@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.

Re: [O] Resolving conflicts with ediff and folding

2015-04-23 Thread J. David Boyd
Charles C. Berry ccbe...@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

[O] Resolving conflicts with ediff and folding

2015-04-20 Thread Suvayu Ali
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

Re: [O] Resolving conflicts with ediff and folding

2015-04-20 Thread Charles C. Berry
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