aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ediff-init.el2
1 files changed, 2 insertions, 0 deletions
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.")
381This hook can be used to save the previous window config, which can be restored 381This hook can be used to save the previous window config, which can be restored
382on ediff-quit or ediff-suspend." 382on ediff-quit or ediff-suspend."
383 :type 'hook 383 :type 'hook
384 :version "21.1"
384 :group 'ediff-hook) 385 :group 'ediff-hook)
385(defcustom ediff-before-setup-windows-hook nil 386(defcustom ediff-before-setup-windows-hook nil
386 "*Hooks to run before Ediff sets its window configuration. 387 "*Hooks to run before Ediff sets its window configuration.
@@ -1220,6 +1221,7 @@ as `ediff-merge-directory' or `ediff-merge-directory-revisions'."
1220(defcustom ediff-merge-filename-prefix "merge_" 1221(defcustom ediff-merge-filename-prefix "merge_"
1221 "*Prefix to be attached to saved merge buffers." 1222 "*Prefix to be attached to saved merge buffers."
1222 :type 'string 1223 :type 'string
1224 :version "21.1"
1223 :group 'ediff-merge) 1225 :group 'ediff-merge)
1224 1226
1225(defcustom ediff-no-emacs-help-in-control-buffer nil 1227(defcustom ediff-no-emacs-help-in-control-buffer nil