2 files changed, 6 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7d72258318c..2c96eeadfb7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,9 @@
         Add more modifiers: meta, control, shift, hyper, super, alt.
         (Bug#17439)
 
+        * avoid.el (mouse-avoidance-banish-position): Fix defcustom :options
+        to allow changing its value with `set-variable'.
+
 2014-05-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * progmodes/scheme.el (scheme-mode-syntax-table): Remove hack for
diff --git a/lisp/avoid.el b/lisp/avoid.el
index de3958745a4..680e509ceba 100644
--- a/lisp/avoid.el
+++ b/lisp/avoid.el
@@ -126,9 +126,9 @@ TOP-OR-BOTTOM: banish the mouse to top or bottom of frame or window.
 TOP-OR-BOTTOM-POS: Distance from top or bottom edge of frame or window."
   :group   'avoid
   :version "24.3"
-  :type    '(alist :key-type symbol :value-type symbol)
-  :options '(frame-or-window side (side-pos integer)
-             top-or-bottom (top-or-bottom-pos integer)))
+  :type    '(alist :key-type symbol :value-type (choice symbol integer))
+  :options '((frame-or-window symbol) (side symbol) (side-pos integer)
+             (top-or-bottom symbol) (top-or-bottom-pos integer)))
 
 ;; Internal variables
 (defvar mouse-avoidance-state nil)