Fork me on GitHub
#spacemacs
<
2019-01-10
>
Mario C.19:01:21

If I am running ediff and went out of it how can I go back in?

Mario C.19:01:55

I wanted to get rid of some windows so i did SPC w d on a window but now I cant seem to go back into the ediff mode

aisamu19:01:31

There's always SPC w u

Mario C.19:01:45

I am seeing that I have the ediff control panel open but I can't move around and see my changes. By that I mean, normally when I am on ediff mode I can hit n and it shows the next changes or N to view the previous changes... right now I can't do that

aisamu21:01:10

Is the control window focused?

practicalli-johnny22:01:16

@mario.cordova.862 If you are using ediff with two files (for example, SPC f e D to compare .spacemacs with its template), then windows 1 and 2 are normal text buffers. Window 3 is the ediff control buffer, a small window underneath the other text buffers, with the text Type ? for help. The ediff controls, eg. n or p only work when the cursor is in window 3, the ediff buffer. If you close the window that contains the ediff controls, you should be able to open that buffer again using the buffer list, SPC b b. When the ediff controls are open again, select that buffer and press one of the ediff control keybindings, e.g. n. This should move the ediff window to the bottom again with both text buffers being compared shown above. This at least worked for me, on develop with Emacs 27.0.50

Mario C.22:01:54

@jr0cket Just tried it! Worked like a charm! Thanks! This always throws me off and I have to quit ediff session and start over

practicalli-johnny22:01:36

It was a useful thing to figure out as I am sure I will do the same thing myself one day, so good to know how to recover an ediff session. Thanks