Hi all
An update for this thread from April:
On Sun, Apr 7, 2013 at 12:24 AM, Michael Brand
michael.ch.br...@gmail.com wrote:
#+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
On Thu, Aug 01, 2013 at 05:09:19PM +0200, Rémi Vanicat wrote:
Ratish Punnoose rat...@gmail.com writes:
[...chomp...chomp...chomp...]
Adding this to org-mode (at least in contrib, or worg) would be really cool.
Done!
Ratish Punnoose rat...@gmail.com writes:
Thorsten Jolitz tjolitz at gmail.com writes:
Hi List,
many files on Worg have this startup option:
,--
| +STARTUP:... fold ...
`--
what leads to trouble when there is a merge-conflict in
Ratish Punnoose rat...@gmail.com writes:
Thorsten Jolitz tjolitz at gmail.com writes:
[...]
#+BEGIN_SRC emacs-lisp
;; diff hooks for org mode
(add-hook 'ediff-select-hook 'f-ediff-org-unfold-tree-element)
(add-hook 'ediff-unselect-hook 'f-ediff-org-fold-tree)
;; Check for org
Thorsten Jolitz tjolitz at gmail.com writes:
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
Michael Brand michael.ch.br...@gmail.com writes:
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
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
Hi,
if I need to ediff two org-files, I just switch their buffers back to
fundamental mode temporarily.
Not elegant, but works.
regards, Marc
Am 06.04.2013 11:47, schrieb Thorsten Jolitz:
Hi List,
many files on Worg have this startup option:
,--
| +STARTUP:...
Marc-Oliver Ihm m...@ihm.name 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
Hi Thorsten
On Sat, Apr 6, 2013 at 11:32 PM, Thorsten Jolitz tjol...@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
Michael Brand michael.ch.br...@gmail.com writes:
Hi Michael,
On Sat, Apr 6, 2013 at 11:32 PM, Thorsten Jolitz tjol...@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
On Sat Apr 06 2013 at 17:24, Michael Brand michael.ch.br...@gmail.com wrote:
But instead of the above I use this for ediff generally, it persists
in Org mode:
You just solved the most annoying little usage problem I've had -
thanks!
Cheers -
bw
--
Bill White . bi...@wolfram.com
No ma'am,
12 matches
Mail list logo
