Commit ca7d9565 authored by Dave Love's avatar Dave Love
Browse files

(ediff-before-setup-hook)

(ediff-merge-filename-prefix): Add :version.
parent 754b75d2
......@@ -381,6 +381,7 @@ that Ediff doesn't know about.")
This hook can be used to save the previous window config, which can be restored
on ediff-quit or ediff-suspend."
:type 'hook
:version "21.1"
:group 'ediff-hook)
(defcustom ediff-before-setup-windows-hook nil
"*Hooks to run before Ediff sets its window configuration.
......@@ -1220,6 +1221,7 @@ as `ediff-merge-directory' or `ediff-merge-directory-revisions'."
(defcustom ediff-merge-filename-prefix "merge_"
"*Prefix to be attached to saved merge buffers."
:type 'string
:version "21.1"
:group 'ediff-merge)
(defcustom ediff-no-emacs-help-in-control-buffer nil
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment