[Emacs-diffs] emacs-24 r117135: * lisp/avoid.el (mouse-avoidance-banish-position): Fix defcustom :options

[Juri Linkov]

------------------------------------------------------------
revno: 117135
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17439
committer: Juri Linkov <address@hidden>
branch nick: emacs-24
timestamp: Wed 2014-05-21 00:20:36 +0300
message:
  * lisp/avoid.el (mouse-avoidance-banish-position): Fix defcustom :options
  to allow changing its value with `set-variable'.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/avoid.el                  avoid.el-20091113204419-o5vbwnq5f7feedwu-640

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-05-20 21:14:44 +0000
+++ b/lisp/ChangeLog    2014-05-20 21:20:36 +0000
@@ -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  <address@hidden>
 
        * progmodes/scheme.el (scheme-mode-syntax-table): Remove hack for

=== modified file 'lisp/avoid.el'
--- a/lisp/avoid.el     2014-05-20 21:14:44 +0000
+++ b/lisp/avoid.el     2014-05-20 21:20:36 +0000
@@ -126,9 +126,9 @@
 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)