emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Michael Brand <michael.ch.brand@gmail.com>
To: Thorsten Jolitz <tjolitz@gmail.com>
Cc: Org Mode <emacs-orgmode@gnu.org>
Subject: Re: [WORG] How to ediff folded Org files?
Date: Sun, 7 Apr 2013 00:24:22 +0200	[thread overview]
Message-ID: <CALn3zoh-xvKJJMyAgyWN16P3dr2u6JXYLQ21SDKB_gXHU_uprA@mail.gmail.com> (raw)
In-Reply-To: <87k3ofwdka.fsf@gmail.com>

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)
          ;; room for more modes
    ;; all modes
    (setq truncate-lines nil))
  (defun f-org-vis-mod-maximum ()
    "Visibility: Show the most possible."
     ((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
      (message "ERR: not in Org mode")


  reply	other threads:[~2013-04-06 22:24 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-06  9:47 Thorsten Jolitz
2013-04-06 20:20 ` Marc-Oliver Ihm
2013-04-06 21:32   ` Thorsten Jolitz
2013-04-06 22:24     ` Michael Brand [this message]
2013-04-06 22:40       ` Thorsten Jolitz
2013-04-06 23:01       ` Bill White
2013-04-09  7:29       ` Christian Egli
2013-12-19 19:00       ` Michael Brand
2013-07-31 23:19 ` Ratish Punnoose
2013-08-01 14:44   ` Thorsten Jolitz
2013-08-01 15:09   ` Rémi Vanicat
2013-08-02 12:22     ` Suvayu Ali

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CALn3zoh-xvKJJMyAgyWN16P3dr2u6JXYLQ21SDKB_gXHU_uprA@mail.gmail.com \
    --to=michael.ch.brand@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    --cc=tjolitz@gmail.com \
    --subject='Re: [WORG] How to ediff folded Org files?' \


* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this inbox:


This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).