From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Brand <michael.ch.brand@gmail.com>
Subject: Re: [WORG] How to ediff folded Org files?
Date: Sun, 7 Apr 2013 00:24:22 +0200
Message-ID: <CALn3zoh-xvKJJMyAgyWN16P3dr2u6JXYLQ21SDKB_gXHU_uprA@mail.gmail.com>
References: <87y5cwrnw9.fsf@gmail.com> <516083A6.9090305@ihm.name>
	<87k3ofwdka.fsf@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([208.118.235.92]:55986)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <michael.ch.brand@gmail.com>) id 1UObXE-0003h5-4t
	for emacs-orgmode@gnu.org; Sat, 06 Apr 2013 18:24:34 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <michael.ch.brand@gmail.com>) id 1UObX6-0003Sa-40
	for emacs-orgmode@gnu.org; Sat, 06 Apr 2013 18:24:32 -0400
Received: from mail-lb0-f176.google.com ([209.85.217.176]:47439)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <michael.ch.brand@gmail.com>) id 1UObX5-0003SM-Sv
	for emacs-orgmode@gnu.org; Sat, 06 Apr 2013 18:24:24 -0400
Received: by mail-lb0-f176.google.com with SMTP id y8so4641820lbh.7
	for <emacs-orgmode@gnu.org>; Sat, 06 Apr 2013 15:24:22 -0700 (PDT)
In-Reply-To: <87k3ofwdka.fsf@gmail.com>
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: Thorsten Jolitz <tjolitz@gmail.com>
Cc: Org Mode <emacs-orgmode@gnu.org>

Hi Thorsten

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 "!".

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

Michael