(ediff-before-setup-hook)

(ediff-merge-filename-prefix): Add :version.

diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el
index 8f3d472bd5d91503eac5dad0f011c20452e2d8dd..475d59c061b5d9065c6d40ccabd7b9ec9d3f36ec 100644 (file)
--- a/lisp/ediff-init.el
+++ b/lisp/ediff-init.el
@@ -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