diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/ediff-wind.el | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b10cbdaa0c..4e0e53a0a7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2002-07-25 Markus Rost <[email protected]> + + * ediff-wind.el (ediff-window-setup-function): Extend type + declaration. + 2002-07-25 Sam Steingold <[email protected]> * replace.el (occur-rename-buffer): New command. diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el index 8d8334705d..ae65b1d6f5 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 |