aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/avoid.el
diff options
context:
space:
mode:
authorKenichi Handa2012-10-07 21:58:14 +0900
committerKenichi Handa2012-10-07 21:58:14 +0900
commitdade5fca51ce2ed10fdace1cfcf78287599154a1 (patch)
tree299c84e1ce2c5a95237b41781113790626d259c5 /lisp/avoid.el
parent6aa75fb62f6cdc4164d935ef14d57feec5ed6e0a (diff)
parent78d876b90e52400b7bbb086ca1a471d3d20d0e98 (diff)
downloademacs-dade5fca51ce2ed10fdace1cfcf78287599154a1.tar.gz
emacs-dade5fca51ce2ed10fdace1cfcf78287599154a1.zip
merge trunk
Diffstat (limited to 'lisp/avoid.el')
-rw-r--r--lisp/avoid.el1
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.
128TOP-OR-BOTTOM: banish the mouse to top or bottom of frame or window. 128TOP-OR-BOTTOM: banish the mouse to top or bottom of frame or window.
129TOP-OR-BOTTOM-POS: Distance from top or bottom edge of frame or window." 129TOP-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)))