From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thorsten Jolitz Subject: Re: [WORG] How to ediff folded Org files? Date: Sat, 06 Apr 2013 23:32:05 +0200 Message-ID: <87k3ofwdka.fsf@gmail.com> References: <87y5cwrnw9.fsf@gmail.com> <516083A6.9090305@ihm.name> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([208.118.235.92]:48451) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UOais-00021n-Dr for emacs-orgmode@gnu.org; Sat, 06 Apr 2013 17:32:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UOaim-0004d2-Ig for emacs-orgmode@gnu.org; Sat, 06 Apr 2013 17:32:30 -0400 Received: from plane.gmane.org ([80.91.229.3]:52053) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UOaim-0004ch-Bf for emacs-orgmode@gnu.org; Sat, 06 Apr 2013 17:32:24 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1UOaig-0000Bn-Oq for emacs-orgmode@gnu.org; Sat, 06 Apr 2013 23:32:18 +0200 Received: from e178191176.adsl.alicedsl.de ([85.178.191.176]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 06 Apr 2013 23:32:18 +0200 Received: from tjolitz by e178191176.adsl.alicedsl.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 06 Apr 2013 23:32:18 +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 Marc-Oliver Ihm writes: Hi, > if I need to ediff two org-files, I just switch their buffers back to > fundamental mode temporarily. Not elegant, but works. the problem is, if I call e (ediff) from Magit and want to merge (e.g.) my branch with the master branch, I don't really have access to both versions - only to the version from the checked out branch. ediff then gives me both versions in an ediff session (folded), but if I try to change major-mode to fundamental I break the ediff session. > Am 06.04.2013 11:47, schrieb Thorsten Jolitz: >> >> Hi List, >> >> many files on Worg have this startup option: >> >> ,-------------------------- >> | +STARTUP: ... fold ... >> `-------------------------- >> >> what leads to trouble when there is a merge-conflict in (Ma)git to be >> resolved manually with e(diff), because the different versions of the >> Org-file are then presented in folded state in the ediff session, so the >> diffs are invisible. >> >> But when I call 'show-all' or so on them, it breaks the ediff session. >> Is there a simple trick to avoid this problem? >> >> PS >> I don't recieve any new messages from my gmane groups any more since >> yesterday - am I the only one? -- cheers, Thorsten