# HG changeset patch
# User Reiner Steib <Reiner.Steib@gmx.de>
# Date 1207993662 0
# Node ID 62c45d39d36055368178c8638366a47ee07da3cf
# Parent  23d6df7eb459a9126cdb5bff3d57e6929150095e
(ediff-split-window-function, ediff-merge-split-window-function):
Improve custom type.

diff -r 23d6df7eb459 -r 62c45d39d360 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Apr 12 09:26:40 2008 +0000
+++ b/lisp/ChangeLog	Sat Apr 12 09:47:42 2008 +0000
@@ -1,3 +1,8 @@
+2008-04-12  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* ediff-wind.el (ediff-split-window-function)
+	(ediff-merge-split-window-function): Improve custom type.
+
 2008-04-12  Eli Zaretskii  <eliz@gnu.org>
 
 	* loadup.el ("minibuffer"): Move after "faces".
diff -r 23d6df7eb459 -r 62c45d39d360 lisp/ediff-wind.el
--- a/lisp/ediff-wind.el	Sat Apr 12 09:26:40 2008 +0000
+++ b/lisp/ediff-wind.el	Sat Apr 12 09:47:42 2008 +0000
@@ -137,7 +137,10 @@
 You can also have your own function to do fancy splits.
 This variable has no effect when buffer-A/B are shown in different frames.
 In this case, Ediff will use those frames to display these buffers."
-  :type 'function
+  :type '(choice
+	  (const :tag "Split vertically" split-window-vertically)
+	  (const :tag "Split horizontally" split-window-horizontally)
+	  function)
   :group 'ediff-window)
 
 (defcustom ediff-merge-split-window-function 'split-window-horizontally
@@ -147,7 +150,10 @@
 You can also have your own function to do fancy splits.
 This variable has no effect when buffer-A/B/C are shown in different frames.
 In this case, Ediff will use those frames to display these buffers."
-  :type 'function
+  :type '(choice
+	  (const :tag "Split vertically" split-window-vertically)
+	  (const :tag "Split horizontally" split-window-horizontally)
+	  function)
   :group 'ediff-window)
 
 ;; Definitions hidden from the compiler by compat wrappers.