search

DogLooksGood / parinfer-mode

Parinfer for Emacs :)
GNU General Public License v3.0
407 stars 33 forks source link

Ediff usability. #47

Open ClashTheBunny opened 7 years ago

ClashTheBunny commented 7 years ago

I was having major problems with with a merge with Ediff. I think parinfer kept re-indenting or complicating the merge. Is there a way to disable this in ediff mode? Is that possibly my problem?

DogLooksGood commented 7 years ago

Hi, @ClashTheBunny .

If the parens are totally correct, it's unnecessary to use Ediff, just select whole buffer and press C-M-\ to re-indent the code, then you're safe to switch to indent mode.

If the indent are totally correct, you should just M-x parinfer-toggle-mode to force switching mode.

Otherwise, Ediff will be used to merge, just use b to merge and n to go for next.