Mercurial > emacs
comparison lisp/ediff-wind.el @ 18839:1405083241e8
new version
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Thu, 17 Jul 1997 19:37:07 +0000 |
| parents | 0b9d9cbf3cd4 |
| children | f90d40b0bff5 |
comparison
equal
deleted
inserted
replaced
| 18838:6f9fa4c8e92a | 18839:1405083241e8 |
|---|---|
| 175 (defcustom ediff-control-frame-position-function 'ediff-make-frame-position | 175 (defcustom ediff-control-frame-position-function 'ediff-make-frame-position |
| 176 "Function to call to determine the desired location for the control panel. | 176 "Function to call to determine the desired location for the control panel. |
| 177 Expects three parameters: the control buffer, the desired width and height | 177 Expects three parameters: the control buffer, the desired width and height |
| 178 of the control frame. It returns an association list | 178 of the control frame. It returns an association list |
| 179 of the form \(\(top . <position>\) \(left . <position>\)\)" | 179 of the form \(\(top . <position>\) \(left . <position>\)\)" |
| 180 :type 'boolean | 180 :type 'function |
| 181 :group 'ediff-window) | 181 :group 'ediff-window) |
| 182 | 182 |
| 183 (defcustom ediff-control-frame-upward-shift (if ediff-xemacs-p 42 14) | 183 (defcustom ediff-control-frame-upward-shift (if ediff-xemacs-p 42 14) |
| 184 "*The upward shift of control frame from the top of buffer A's frame. | 184 "*The upward shift of control frame from the top of buffer A's frame. |
| 185 Measured in pixels. | 185 Measured in pixels. |