summaryrefslogtreecommitdiff
path: root/lisp/ediff-wind.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ediff-wind.el')
-rw-r--r--lisp/ediff-wind.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index 8d8334705d2..ae65b1d6f51 100644
--- a/lisp/ediff-wind.el
+++ b/lisp/ediff-wind.el
@@ -94,7 +94,9 @@ The basic guidelines:
Buffer C may not be used in jobs that compare only two buffers.
If you plan to do something fancy, take a close look at how the two
provided functions are written."
- :type 'function
+ :type '(choice (const :tag "Multi Frame" ediff-setup-windows-multiframe)
+ (const :tag "Single Frame" ediff-setup-windows-plain)
+ (function :tag "Other function"))
:group 'ediff-window)
;; indicates if we are in a multiframe setup