(ediff-window-setup-function): Extend type declaration.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b10cbdaa0c875d9515a9db8c1c25c8249a96fd9a..4e0e53a0a7e85d1061f70e876937a50bbc825c3b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-25  Markus Rost  <rost@math.ohio-state.edu>
+
+       * ediff-wind.el (ediff-window-setup-function): Extend type
+       declaration.
+
 2002-07-25  Sam Steingold  <sds@gnu.org>
 
        * replace.el (occur-rename-buffer): New command.

diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index 8d8334705d22d6cf4948f792b404e6fcc556b565..ae65b1d6f51131ce31fd4afad0f04017eecf731e 100644 (file)
--- 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