Mercurial > emacs

changeset 35377:ee8a7170097b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(ediff-before-setup-hook) (ediff-merge-filename-prefix): Add :version.
author Dave Love <fx@gnu.org>
date Wed, 17 Jan 2001 18:28:50 +0000
parents 19d92c9e26e9
children 1ae53bd2e777
files lisp/ediff-init.el
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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