Mercurial > emacs
diff lisp/ediff-init.el @ 35377:ee8a7170097b
(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 | fdb5d08ced13 |
children | be20c22dc16d |
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