(ediff-split-window-function, ediff-merge-split-window-function):

Improve custom type.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b8b54ab8107a8f946bf9e365a527c2f256f7043e..253c2db6c7292444a281b47fb893f15437c6c6e3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index 17cd25d871369493c8e4d2e71c87254f3ee81159..5e698c39ebbae9503e0faf6060038e57ac4e25be 100644 (file)
--- a/lisp/ediff-wind.el
+++ b/lisp/ediff-wind.el
@@ -137,7 +137,10 @@ by setting this variable to `split-window-horizontally'.
 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 @@ by setting this variable to `split-window-vertically'.
 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.