From: Markus Rost <rost@math.uni-bielefeld.de>
Date: Fri, 26 Jul 2002 02:11:28 +0000 (+0000)
Subject: (ediff-window-setup-function): Extend type declaration.
X-Git-Tag: ttn-vms-21-2-B4~13855
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e5184e9fcb07c63398ce4d6163fdd8e5597a88dd;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b10cbdaa0c8..4e0e53a0a7e 100644
--- 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 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