From: "Charles C. Berry" <ccberry@ucsd.edu>
To: Suvayu Ali <fatkasuvayu+linux@gmail.com>
Cc: Emacs Org mode <emacs-orgmode@gnu.org>
Subject: Re: Resolving conflicts with ediff and folding
Date: Mon, 20 Apr 2015 18:00:10 -0700 [thread overview]
Message-ID: <alpine.OSX.2.00.1504201758560.2225@charles-berrys-macbook.local> (raw)
In-Reply-To: <20150420232308.GB26502@chitra.no-ip.org>
On Tue, 21 Apr 2015, Suvayu Ali wrote:
> 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?
Did you see this thread:
http://lists.gnu.org/archive/html/emacs-orgmode/2013-04/msg00400.html
??
HTH,
Chuck
next prev parent reply other threads:[~2015-04-21 1:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-20 23:23 Resolving conflicts with ediff and folding Suvayu Ali
2015-04-21 1:00 ` Charles C. Berry [this message]
2015-04-23 14:14 ` J. David Boyd
[not found] ` <gjub383rgce1.fsf-JUvT7rMoG4SqrIjp+dE73DJtLkR7yuzc@public.gmane.org>
2015-04-28 9:43 ` Sebastien Vauban
2015-05-04 6:23 ` iemacs
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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
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=alpine.OSX.2.00.1504201758560.2225@charles-berrys-macbook.local \
--to=ccberry@ucsd.edu \
--cc=emacs-orgmode@gnu.org \
--cc=fatkasuvayu+linux@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
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).