From mboxrd@z Thu Jan  1 00:00:00 1970
From: Thorsten Jolitz <tjolitz@gmail.com>
Subject: Re: [WORG] How to ediff folded Org files?
Date: Sun, 07 Apr 2013 00:40:32 +0200
Message-ID: <878v4vwae7.fsf@gmail.com>
References: <87y5cwrnw9.fsf@gmail.com> <516083A6.9090305@ihm.name>
	<87k3ofwdka.fsf@gmail.com>
	<CALn3zoh-xvKJJMyAgyWN16P3dr2u6JXYLQ21SDKB_gXHU_uprA@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([208.118.235.92]:59837)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1UObmu-0007GV-TX
	for emacs-orgmode@gnu.org; Sat, 06 Apr 2013 18:40:46 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1UObmt-0000Lh-Pb
	for emacs-orgmode@gnu.org; Sat, 06 Apr 2013 18:40:44 -0400
Received: from plane.gmane.org ([80.91.229.3]:52620)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1UObmt-0000LS-59
	for emacs-orgmode@gnu.org; Sat, 06 Apr 2013 18:40:43 -0400
Received: from list by plane.gmane.org with local (Exim 4.69)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1UObms-0003M8-3F
	for emacs-orgmode@gnu.org; Sun, 07 Apr 2013 00:40:42 +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 <emacs-orgmode@gnu.org>; Sun, 07 Apr 2013 00:40:42 +0200
Received: from tjolitz by e178191176.adsl.alicedsl.de with local (Gmexim 0.1
	(Debian)) id 1AlnuQ-0007hv-00
	for <emacs-orgmode@gnu.org>; Sun, 07 Apr 2013 00:40:42 +0200
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=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

Michael Brand <michael.ch.brand@gmail.com> writes:

Hi Michael,

> On Sat, Apr 6, 2013 at 11:32 PM, Thorsten Jolitz <tjolitz@gmail.com> wrote:
>> 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.
>
> You should be able to refresh the ediff session with "!".

I'll try that ...

> But instead of the above I use this for ediff generally, it persists
> in Org mode:
>
> #+BEGIN_SRC emacs-lisp
>   (add-hook 'ediff-prepare-buffer-hook 'f-ediff-prepare-buffer-hook-setup)
>   (defun f-ediff-prepare-buffer-hook-setup ()
>     ;; specific modes
>     (cond ((eq major-mode 'org-mode)
>            (f-org-vis-mod-maximum))
>           ;; room for more modes
>           )
>     ;; all modes
>     (setq truncate-lines nil))
>   (defun f-org-vis-mod-maximum ()
>     "Visibility: Show the most possible."
>     (cond
>      ((eq major-mode 'org-mode)
>       (visible-mode 1)  ; default 0
>       (setq truncate-lines nil)  ; no `org-startup-truncated' in hook
>       (setq org-hide-leading-stars t))  ; default nil
>      (t
>       (message "ERR: not in Org mode")
>       (ding))))
> #+END_SRC

very useful, thanks, I already put this into my .emacs. 

-- 
cheers,
Thorsten