From: Dave Love <fx@gnu.org>
Date: Wed, 17 Jan 2001 18:28:50 +0000 (+0000)
Subject: (ediff-before-setup-hook)
X-Git-Tag: emacs-pretest-21.0.96~235
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ca7d9565e90c94ec62d5677eff7c9391bca20f04;p=emacs.git

(ediff-before-setup-hook)
(ediff-merge-filename-prefix): Add :version.
---

diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el
index 8f3d472bd5d..475d59c061b 100644
--- 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