emacs-27.2/info/ediff.info

409      ‘ediff-custom-diff-program’ and ‘ediff-custom-diff-options’), if it
606      command ‘j’).  The above commands, ‘#h’ and ‘#f’, may well save
639      Runs ‘ediff-custom-diff-program’ on the variants and displays the
654      to save these people from the recently discovered Ediff Proficiency
974 user’s responsibility to save them.  If the value is ‘t’, the user will
975 be asked where to save the merge buffers in all merge jobs, even those
979 function ‘ediff-maybe-save-and-delete-merge’, which is a hook in
1098      liking.  Can be used to save windows configuration.
1152      value is ‘ediff-maybe-save-and-delete-merge’, which is a function
1153      that attempts to save the merge buffer according to the value of
1183      It can be used to alter the help message for custom packages that
1196      Ediff sessions.  Can be used, for example, to save window
1476 ‘ediff-current-diff-face-A’
1477 ‘ediff-current-diff-face-B’
1478 ‘ediff-current-diff-face-C’
1484 ‘ediff-fine-diff-face-A’
1485 ‘ediff-fine-diff-face-B’
1486 ‘ediff-fine-diff-face-C’
1490 ‘ediff-even-diff-face-A’
1491 ‘ediff-even-diff-face-B’
1492 ‘ediff-even-diff-face-C’
1493 ‘ediff-odd-diff-face-A’
1494 ‘ediff-odd-diff-face-B’
1495 ‘ediff-odd-diff-face-C’
1541      (setq ediff-current-diff-face-A
1542            (copy-face 'bold-italic 'ediff-current-diff-face-A))
1544 would use the pre-defined face ‘bold-italic’ to highlight the current
1545 difference region in buffer A (this face is not a good choice, by the
1554                  (set-face-foreground
1555                    ediff-current-diff-face-B "blue")
1556                  (set-face-background
1557                    ediff-current-diff-face-B "red")
1558                  (make-face-italic
1559                    ediff-current-diff-face-B)))
1561    *Please note:* to set Ediff’s faces, use only ‘copy-face’ or
1562 ‘set/make-face-...’ as shown above.  Emacs’s low-level face-manipulation
1732 ‘ediff-custom-diff-program’
1733 ‘ediff-custom-diff-options’
1736      save the output from ‘diff’ in your preferred format, which is
1739      The output generated by ‘ediff-custom-diff-program’ (which doesn’t
1746      differences.  Fortunately, ‘ediff-custom-diff-program’ and
1747      ‘ediff-custom-diff-options’ eliminate this nuisance by keeping a
1921 to the merge buffer—it will be the user’s responsibility to save it.  If
1922 the value is ‘t’, the user will be asked where to save the buffer and
1928 ‘ediff-maybe-save-and-delete-merge’, which is a hook in
2126 way to throw in custom variables (which usually should be buffer-local)
2132    Finally, if you want custom-tailored help messages, you can set the
2860 * ediff-current-diff-face-A:             Highlighting Difference Regions.
2862 * ediff-current-diff-face-B:             Highlighting Difference Regions.
2864 * ediff-current-diff-face-C:             Highlighting Difference Regions.
2867 * ediff-custom-diff-options:             Patch and Diff Programs.
2869 * ediff-custom-diff-program:             Patch and Diff Programs.
2887 * ediff-even-diff-face-A:                Highlighting Difference Regions.
2889 * ediff-even-diff-face-B:                Highlighting Difference Regions.
2891 * ediff-even-diff-face-C:                Highlighting Difference Regions.
2895 * ediff-fine-diff-face-A:                Highlighting Difference Regions.
2897 * ediff-fine-diff-face-B:                Highlighting Difference Regions.
2899 * ediff-fine-diff-face-C:                Highlighting Difference Regions.
2934 * ediff-maybe-save-and-delete-merge:     Hooks.               (line  66)
2935 * ediff-maybe-save-and-delete-merge <1>: Merging and diff3.   (line 165)
2959 * ediff-odd-diff-face-A:                 Highlighting Difference Regions.
2961 * ediff-odd-diff-face-B:                 Highlighting Difference Regions.
2963 * ediff-odd-diff-face-C:                 Highlighting Difference Regions.
2991 * ediff-save-buffer:                     Patch and Diff Programs.