diff options
| author | Daniel Colascione | 2012-10-07 14:31:58 -0800 |
|---|---|---|
| committer | Daniel Colascione | 2012-10-07 14:31:58 -0800 |
| commit | 36a305a723c63fd345be65c536c52fe9765c14be (patch) | |
| tree | fb89d9e103552863214c60297a65320917109357 /lisp/avoid.el | |
| parent | 2ab329f3b5d52a39f0a45c3d9c129f1c19560142 (diff) | |
| parent | 795b1482a9e314cda32d62ac2988f573d359366e (diff) | |
| download | emacs-36a305a723c63fd345be65c536c52fe9765c14be.tar.gz emacs-36a305a723c63fd345be65c536c52fe9765c14be.zip | |
Merge from trunk
Diffstat (limited to 'lisp/avoid.el')
| -rw-r--r-- | lisp/avoid.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/avoid.el b/lisp/avoid.el index 2fa6ef39e70..7f4b78bf5e0 100644 --- a/lisp/avoid.el +++ b/lisp/avoid.el | |||
| @@ -128,6 +128,7 @@ SIDE-POS: Distance from right or left edge of frame or window. | |||
| 128 | TOP-OR-BOTTOM: banish the mouse to top or bottom of frame or window. | 128 | TOP-OR-BOTTOM: banish the mouse to top or bottom of frame or window. |
| 129 | TOP-OR-BOTTOM-POS: Distance from top or bottom edge of frame or window." | 129 | TOP-OR-BOTTOM-POS: Distance from top or bottom edge of frame or window." |
| 130 | :group 'avoid | 130 | :group 'avoid |
| 131 | :version "24.3" | ||
| 131 | :type '(alist :key-type symbol :value-type symbol) | 132 | :type '(alist :key-type symbol :value-type symbol) |
| 132 | :options '(frame-or-window side (side-pos integer) | 133 | :options '(frame-or-window side (side-pos integer) |
| 133 | top-or-bottom (top-or-bottom-pos integer))) | 134 | top-or-bottom (top-or-bottom-pos integer))) |