Buy the book!
|[ < ]||[ > ]||[ << ]||[ Up ]||[ >> ]||[Top]||[Contents]||[Index]||[ ? ]|
With prefix argument, saves the plain output from
ediff-diff-options). Without the
argument, it saves customized
diff output (see
it is available.
In merge sessions: Copies the current difference region (or the region specified as the prefix to this command) from buffer A to the merge buffer. The old contents of this region in buffer C can be restored via the command r.
Ediff saves the old contents of the difference region copied over; it can be reinstated via the command ra in comparison sessions and r in merge sessions.
-j makes the last region current. Typing a number, N, and then `j' makes the difference region N current. Typing -N (a negative number) then `j' makes current the region Last - N.
However, with a prefix argument, Ediff would position all variants around the area indicated by the current point in buffer A: if the point is inside a difference region, then the variants will be positioned at this difference region. If the point is not in any difference region, then it is in an area where all variants agree with each other. In this case, the variants will be positioned so that each would display this area (of agreement).
With a prefix argument, behaves like ga, but with respect to buffer B.
In 3-file comparison sessions: makes current the region closest to the point in buffer C.
With a prefix argument, behaves like ga, but with respect to buffer C.
Forceful refinement may be needed if Ediff encounters a difference region
that is larger than
ediff-auto-refine-limit. In this situation,
Ediff doesn't do automatic refinement in order to improve response time.
(Ediff doesn't auto-refine on dumb terminals as well, but * still
works there. However, the only useful piece of information it can tell you
is whether or not the difference regions disagree only in the amount of
This command is also useful when the highlighted fine differences are no longer current, due to user editing.
On slow machines, it may be advantageous to turn auto-refinement off. The user can always forcefully refine specific difference regions by typing *.
This command is enabled in merge sessions only.
Even though such regions will be skipped over, you can still jump to any one of them by typing the region number and then `j'. Typing ## again puts Ediff back in the original state.
Quite often differences are due to identical replacements (e.g., the word `foo' is replaced with the word `bar' everywhere). If the number of regions with such boring differences exceeds your tolerance threshold, you may be tempted to tell Ediff to skip these regions altogether (you will still be able to jump to them via the command j). The above commands, #h and #f, may well save your day!
#h prompts you to specify regular expressions for each variant. Difference regions where each variant's region matches the corresponding regular expression will be skipped from then on. (You can also tell Ediff to skip regions where at least one variant matches its regular expression.)
#f does dual job: it focuses on regions that match the corresponding regular expressions. All other regions will be skipped over. See section 7.4 Selective Browsing, for more.
ediff-custom-diff-programon the variants and displays the buffer containing the output. This is useful when you must send the output to your Mom.
With a prefix argument, displays the plain
See section 7.8 Patch and Diff Programs, for details.
(Some poor souls leave so many active Ediff sessions around that they loose track of them completely... The `R' command is designed to save these people from the recently discovered Ediff Proficiency Syndrome.)
Typing R brings up Ediff Registry only if it is typed into an Ediff Control Panel. If you don't have a control panel handy, type this in the minibuffer: M-x eregistry. See section 4. Registry of Ediff Sessions.
The easiest way to resume a suspended Ediff session is through the registry of active sessions. See section 4. Registry of Ediff Sessions, for details.
ediff-regions-*, which see.
You may want to ignore such `obvious' merges and concentrate on difference regions where both files `clash' with the ancestor, since this means that two different people have been changing this region independently and they had different ideas on how to do this.
The above command does this for you by skipping the regions where only one of the variants clashes with the ancestor but the other variant agrees with it. Typing $$ again undoes this setting.
To be more precise, this toggles the check for whether the current merge is identical to its default setting, as originally decided by Ediff. For instance, if Ediff is merging according to the `combined' policy, then the merge region is skipped over if it is different from the combination of the regions in buffers A and B. (Warning: swapping buffers A and B will confuse things in this respect). If the merge region is marked as `prefer-A' then this region will be skipped if it differs from the current difference region in buffer A, etc.
In other cases, the right course of action is not that clearcut, and Ediff would use a default action. The above command changes the default action. The default action can be `default-A' (choose the region from buffer A), `default-B' (choose the region from buffer B), or `combined' (combine the regions from the two buffers). See section 7.9 Merging and diff3, for further details.
The command & also affects the regions in the merge buffers that have `default-A', `default-B', or `combined' status, provided they weren't changed with respect to the original. For instance, if such a region has the status `default-A' then changing the default action to `default-B' will also replace this merge-buffer's region with the corresponding region from buffer B.
With a positive prefix argument, this command enlarges the merge window. E.g., 4s increases the size of the window by about 4 lines, if possible. With a negative numeric argument, the size of the merge window shrinks by that many lines, if possible. Thus, -s shrinks the window by about 1 line and -3s by about 3 lines.
This command is intended only for temporary viewing; therefore, Ediff restores window C to its original size whenever it makes any other change in the window configuration. However, redisplaying (C-l) or jumping to another difference does not affect window C's size.
The split between the merge window and the variant windows is controlled by
ediff-merge-window-share, which see.
The above command compares regions within Ediff buffers. This creates a child Ediff session for comparing current Emacs regions in buffers A, B, or C as follows:
If you are comparing 2 files or buffers: Ediff would compare current Emacs regions in buffers A and B.
If you are comparing 3 files or buffers simultaneously: Ediff would compare the current Emacs regions in the buffers of your choice (you will be asked which two of the three buffers to use).
If you are merging files or buffers (with or without ancestor): Ediff would take the current region in the merge buffer and compare it to the current region in the buffer of your choice (A or B).
Note: In all these cases you must first switch to the appropriate Emacs buffers and manually set the regions that you want to compare.
Highlighting set by the parent Ediff session is removed, to avoid interference with highlighting of the child session. When done with the child session, type C-l in the parent's control panel to restore the original highlighting.
If you temporarily switch to the parent session, parent highlighting will be restored. If you then come back to the child session, you may want to remove parent highlighting, so it won't interfere. Typing h may help here.
|[ < ]||[ > ]||[ << ]||[ Up ]||[ >> ]||[Top]||[Contents]||[Index]||[ ? ]|
|webmaster||delorie software privacy|
|Copyright © 2003 by The Free Software Foundation||Updated Jun 2003|