5.8.1 Ediff Install

In your initialization file, bind the Transient casual-ediff-tmenu to your key binding of preference.

(casual-ediff-install) ; run this to enable Casual Ediff
(add-hook 'ediff-keymap-setup-hook
          (lambda ()
            (keymap-set ediff-mode-map "C-o" #'casual-ediff-tmenu)))

If the current buffer is loaded with a version-controlled file, then the difference between that buffer’s content with its most recent commit can be seen with the command casual-ediff-revision. It is often convenient to bind this command. Shown below is an example of such a binding.

(keymap-global-set "<f15>" #'casual-ediff-revision)

Users who wish to call casual-ediff-revision via mouse can use the command casual-ediff-revision-from-menu. An example of its use is shown in the source example below (note this is a code fragment).

(easy-menu-add-item
     menu nil
     ["Ediff revision…"
      casual-ediff-revision-from-menu
      :visible (and (bound-and-true-p buffer-file-name)
                    (vc-registered (buffer-file-name)))
      :help "Ediff this file with revision"])

Ediff Variables

Casual Ediff recommends the following variables be set as follows:

VariableValue
ediff-keep-variantsnil
ediff-window-setup-functionediff-setup-windows-plain
ediff-split-window-functionsplit-window-horizontally