diff options
| author | Eli Zaretskii | 2012-10-07 15:37:05 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2012-10-07 15:37:05 +0200 |
| commit | 25d99a950debf417295e68a7a7d519b4ddf3e546 (patch) | |
| tree | a7d9fba3285833d9bc3e261cda8c197a620d7873 /lisp/avoid.el | |
| parent | 6f011d8194bd146065c5c2c5d6369a80d6773c68 (diff) | |
| parent | 493b5b1c4a7e8b27a0e57c596a83e8b4acad591c (diff) | |
| download | emacs-25d99a950debf417295e68a7a7d519b4ddf3e546.tar.gz emacs-25d99a950debf417295e68a7a7d519b4ddf3e546.zip | |
Merge from mainline.
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))) |