Questions tagged [ediff]
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.
98 questions
0 votes
0 answers
29 views
ediff: Window is dedicated to Ediff Control Panel
In ediff-mode, the help says that hitting R will display the session registry. But when I do, it shows an error message instead, stating Window is dedicated to Ediff Control Panel. Showing the ...
- 229
0 votes
1 answer
32 views
specify ad-hoc options for `git diff` in magit?
Sometimes I use the --color-words=. option with git diff to see character-level differences. I also may use --ws-highlight-error=all. The specifics of the options isn't crucial; what I want is to have ...
- 809
1 vote
0 answers
31 views
How to restrict the regions to skip (or "hide") in ediff buffer comparison, to those that completely match the whole regex?
I have a file that is automatically generated, and another one based on a version of the former with lots of systematic additions. Those additions are always the same text for the whole line, so it ...
- 11
1 vote
1 answer
122 views
Git difftool on windows causing "Non-hex character used for Unicode escape: s (115)"
I want to use ediff as difftool for git. I copied the configuration for git from here: [difftool.ediff] cmd = emacs -Q --eval \"(ediff-files \\\"$LOCAL\\\" \\\"$REMOTE\\\")...
- 180
1 vote
1 answer
50 views
How to set truncate-lines for both files in ediff mode
I use a default .emacs line to truncate lines (setq truncate-lines t) However, for ediff mode I want to see the entire line for both files being compared. Have been toggling manually at each ediff ...
- 13
0 votes
0 answers
61 views
Doesn't automatically jump to different characters in both buffers
Emacs 27.1 I want to find differents between 2 buffers. I use command ediff-buffers Steps: Type the n in the Ediff Control Panel Again Type the n in the Ediff Control Panel And because the line is ...
- 4,386
0 votes
1 answer
87 views
Modern Emacs keeps opening related file from vc-diff buffer
Initially I opened Lags when navigating vc-root-diff buffer and the cause of slowness was Emacs opening referenced files by diff. Back then I used Emacs 27.1. Now I'm on Emacs 28.2 and previous ...
- 3,582
0 votes
2 answers
94 views
How to change the binding of "?" on the help command in ediff-mode?
I am willing to learn how to use ediff-mode. One of the reasons that I am struggling is because I need to ask for help which is bound to ?. Unfortunately, I am having a hard time with ? on an American ...
- 1,801