# HG changeset patch
# User Dave Love <fx@gnu.org>
# Date 979756130 0
# Node ID ee8a7170097b161dbd96ff6e86c457df1bd5d4db
# Parent  19d92c9e26e92cfd13939bf3ac3c2968f61cc2ea
(ediff-before-setup-hook)
(ediff-merge-filename-prefix): Add :version.

diff -r 19d92c9e26e9 -r ee8a7170097b lisp/ediff-init.el
--- a/lisp/ediff-init.el	Wed Jan 17 17:49:37 2001 +0000
+++ b/lisp/ediff-init.el	Wed Jan 17 18:28:50 2001 +0000
@@ -381,6 +381,7 @@
 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 @@
 (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