From mboxrd@z Thu Jan 1 00:00:00 1970 From: dboyd2@mmm.com (J. David Boyd) Subject: Re: Resolving conflicts with ediff and folding Date: Thu, 23 Apr 2015 10:14:30 -0400 Message-ID: References: <20150420232308.GB26502@chitra.no-ip.org> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53238) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YlHu9-0002tH-2q for emacs-orgmode@gnu.org; Thu, 23 Apr 2015 10:15:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YlHtz-0005iD-6C for emacs-orgmode@gnu.org; Thu, 23 Apr 2015 10:15:01 -0400 Received: from plane.gmane.org ([80.91.229.3]:45644) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YlHty-0005hh-VT for emacs-orgmode@gnu.org; Thu, 23 Apr 2015 10:14:51 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YlHtw-0007q3-18 for emacs-orgmode@gnu.org; Thu, 23 Apr 2015 16:14:48 +0200 Received: from 169.15.136.127 ([169.15.136.127]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 23 Apr 2015 16:14:47 +0200 Received: from dboyd2 by 169.15.136.127 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 23 Apr 2015 16:14:47 +0200 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@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org "Charles C. Berry" 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