From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sebastien Vauban Subject: Re: Resolving conflicts with ediff and folding Date: Tue, 28 Apr 2015 11:43:10 +0200 Message-ID: <86wq0wfv0x.fsf@example.com> References: <20150420232308.GB26502@chitra.no-ip.org> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: (J. David Boyd's message of "Thu, 23 Apr 2015 10:14:30 -0400") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org-mXXj517/zsQ@public.gmane.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org-mXXj517/zsQ@public.gmane.org To: "J. David Boyd" Cc: emacs-orgmode-mXXj517/zsQ@public.gmane.org J. David Boyd wrote: > "Charles C. Berry" 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