Skip to main content
Search type Search syntax
Tags [tag]
Exact "words here"
Author user:1234
user:me (yours)
Score score:3 (3+)
score:0 (none)
Answers answers:3 (3+)
answers:0 (none)
isaccepted:yes
hasaccepted:no
inquestion:1234
Views views:250
Code code:"if (foo != bar)"
Sections title:apples
body:"apples oranges"
URL url:"*.example.com"
Saves in:saves
Status closed:yes
duplicate:no
migrated:no
wiki:no
Types is:question
is:answer
Exclude -[tag]
-apples
For more details on advanced search visit our help page
Results tagged with
Search options answers only not deleted user 105

Ediff is a feature of Emacs which allows comparing two or more files or buffers, as well as merging two files or buffers into one.

0 votes
Accepted

How do I run two simultaneous ediffs involving the same file? i.e., ediffs A, B and A, C

Just use ediff-buffers on A and B. And then use ediff-buffers on A and C. You will have two different control panels, one for A vs B and one for A vs C. …
Drew's user avatar
  • 79.1k
1 vote

How do I compare regions in the same file?

One thing I sometimes use for this is command compare-windows (repeated). It compares the text in two windows, starting at point. Compare text in current window with text in next window. Co …
Drew's user avatar
  • 79.1k
2 votes

How to quickly reopen ediff with the same files

So if the last complex command was your ediff command then C-x ESC ESC puts it in the minibuffer, and you just hit RET (Enter key) to repeat the command. … If the ediff command was further back than the last command then just use M-p... or M-r to retrieve it. …
Drew's user avatar
  • 79.1k
2 votes

make ediff jump to closest difference

This is what I do. It almost answers your question. Move the cursor in one of the buffers, say B, to a nearby difference zone (diff). Typically there is one nearby, and syncing there is sufficient. …
Drew's user avatar
  • 79.1k
4 votes
Accepted

How to get back to ediff mode from edit mode

If you can get to buffer *Ediff Control Panel* then do so. You must be in that buffer to use Ediff keys to use Ediff to get to and act on the buffers you are comparing. … Consult the Ediff doc, starting with the Ediff manual (C-h i, scroll down and choose Ediff) or the doc strings, to learn about Ediff. …
Drew's user avatar
  • 79.1k
2 votes

How to undo on ediff A-B changes

Each Ediff change affects one buffer. Go to that buffer and use undo. …
Drew's user avatar
  • 79.1k
0 votes

How can I diff two long lines from the same buffer?

Then use ediff on the buffers. I don't see the problems you mention, with that. …
Drew's user avatar
  • 79.1k
1 vote
Accepted

Is it necessary to save buffers as files in order to use command highlight-compare-buffer?

Not too sure what you're asking, but C-h f highlight-compare-buffers says this, in part: If either buffer is modified and is visiting a file, you are prompted to save the file. Unless the buffer is u …
Drew's user avatar
  • 79.1k