From mboxrd@z Thu Jan 1 00:00:00 1970 From: Suvayu Ali Subject: Resolving conflicts with ediff and folding Date: Tue, 21 Apr 2015 01:23:08 +0200 Message-ID: <20150420232308.GB26502@chitra.no-ip.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:34915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkL25-0001fJ-Sa for emacs-orgmode@gnu.org; Mon, 20 Apr 2015 19:23:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YkL20-0005sa-Sm for emacs-orgmode@gnu.org; Mon, 20 Apr 2015 19:23:17 -0400 Received: from mail-wi0-x22b.google.com ([2a00:1450:400c:c05::22b]:33321) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkL20-0005qr-LD for emacs-orgmode@gnu.org; Mon, 20 Apr 2015 19:23:12 -0400 Received: by wiax7 with SMTP id x7so94696486wia.0 for ; Mon, 20 Apr 2015 16:23:11 -0700 (PDT) Received: from chitra.no-ip.org (sd44012d5.adsl.online.nl. [212.64.18.213]) by mx.google.com with ESMTPSA id e18sm116282wjz.27.2015.04.20.16.23.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Apr 2015 16:23:10 -0700 (PDT) Content-Disposition: inline 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 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.