andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(ediff-before-setup-hook)

Browse source 
(ediff-merge-filename-prefix): Add :version.
This commit is contained in:
Dave Love 2001-01-17 18:28:50 +00:00
parent 754b75d27c
commit ca7d9565e9
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/ediff-init.el
View file

@ -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