(setq org-startup-folded t) makes Org files open with all headlines folded, my attention-deficient preference.

But then diffs are hidden when comparing Org files with ediff! Here is my ediff config:

(use-package ediff
:custom
(ediff-split-window-function 'split-window-horizontally)
(ediff-window-setup-function 'ediff-setup-windows-plain)
:hook
;;; Start Org files in maximally-unfolded view
(ediff-prepare-buffer . #'outline-show-all))

#emacs #OrgMode #ediff

#Ediff, #Emacs tool for comparing and merging versions of a text file, is pretty neat. Worth actually reading the manual and learning its features. Can be a huge time-saver.

I am in rant mood. The #diff tool in #Emacs, called #ediff.

People rant about Emacs', lets say, non-standard user interface. I use it for 40 years and like it. But ediff is just a pita.

In case anyone knows how to get a similar thing to

git difftool --tool=meld --dir-diff

meaning:
- navigate to changes of a git workspace from a dir-tree view
- side-by-side diffs, no weird three-way wtf when I just want to see current changes
- no weird frames/windows mess

Suggestions welcome.

#meld

@[email protected] just merged the new files using #ediff with #emacs.
When maintaining multiple similar #Ansible #inventories, structure them so that both computers and humans can #understand the differences between them. Give them the same sets of files, with values in the same order. In other words, make them very friendly to #diff, #git diff, and #emacs #ediff.
Adding a feature to one inventory was annoying, and making a second consistent with the #conventions in the first was differently annoying, but the third and subsequent inventories were easy.
@mosu I am using spacemacs with evil. It turns out that pressing C-e or C-y in EDIFF control panel scrolls the two split windows above one line at a time. So problem solved ;-) Thanks again for helping! #ediff #spacemacs #emacs #evil
@mosu Thank you so much for the suggestion. I will look into it. I have been a vim user for a long time and want to know more about emacs. So all this is new to me. #vim #emacs #magit #ediff
I am using emacs + magit + ediff to view a commit. I can scroll both of my windows vertically in sync with v and V but each key press causes the windows to scroll by 10 lines or so. Is there a way to configure ediff to scroll one line at a time? Thanks. #emacs #magit #ediff
@fenix there is also #ediff and #magit (if you're working in 'git' repository projects) which integrate diff in more interactive ways
Thank you, #ediff.
LIBRANET.de | Search