Mercurial > emacs
comparison lisp/ediff-wind.el @ 46694:9b8e9cf6b790
(ediff-window-setup-function): Extend type declaration.
author | Markus Rost <rost@math.uni-bielefeld.de> |
---|---|
date | Fri, 26 Jul 2002 02:10:56 +0000 |
parents | 69c91aaa067a |
children | 8e6ed5c1f142 |
comparison
equal
deleted
inserted
replaced
46693:4ed23f64c88c | 46694:9b8e9cf6b790 |
---|---|
92 3. It should accept the following arguments: | 92 3. It should accept the following arguments: |
93 buffer-A, buffer-B, buffer-C, control-buffer | 93 buffer-A, buffer-B, buffer-C, control-buffer |
94 Buffer C may not be used in jobs that compare only two buffers. | 94 Buffer C may not be used in jobs that compare only two buffers. |
95 If you plan to do something fancy, take a close look at how the two | 95 If you plan to do something fancy, take a close look at how the two |
96 provided functions are written." | 96 provided functions are written." |
97 :type 'function | 97 :type '(choice (const :tag "Multi Frame" ediff-setup-windows-multiframe) |
98 (const :tag "Single Frame" ediff-setup-windows-plain) | |
99 (function :tag "Other function")) | |
98 :group 'ediff-window) | 100 :group 'ediff-window) |
99 | 101 |
100 ;; indicates if we are in a multiframe setup | 102 ;; indicates if we are in a multiframe setup |
101 (ediff-defvar-local ediff-multiframe nil "") | 103 (ediff-defvar-local ediff-multiframe nil "") |
102 | 104 |