[Emacs-diffs] trunk r114101: In avoid.el handle case where posn-at-point returns nil.

[Martin Rudalics]

------------------------------------------------------------
revno: 114101
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Mon 2013-09-02 09:11:26 +0200
message:
  In avoid.el handle case where posn-at-point returns nil.
  
  * avoid.el (mouse-avoidance-point-position)
  (mouse-avoidance-too-close-p): Handle case where posn-at-point
  returns nil.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/avoid.el                  avoid.el-20091113204419-o5vbwnq5f7feedwu-640

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-09-02 03:37:18 +0000
+++ b/lisp/ChangeLog    2013-09-02 07:11:26 +0000
@@ -1,3 +1,9 @@
+2013-09-02  Martin Rudalics  <address@hidden>
+
+       * avoid.el (mouse-avoidance-point-position)
+       (mouse-avoidance-too-close-p): Handle case where posn-at-point
+       returns nil.
+
 2013-09-02  Fabián Ezequiel Gallina  <address@hidden>
 
        * progmodes/python.el (python-shell-completion-get-completions):

=== modified file 'lisp/avoid.el'
--- a/lisp/avoid.el     2013-08-29 19:55:58 +0000
+++ b/lisp/avoid.el     2013-09-02 07:11:26 +0000
@@ -154,13 +154,15 @@
 (defun mouse-avoidance-point-position ()
   "Return the position of point as (FRAME X . Y).
 Analogous to `mouse-position'."
-  (let ((edges (window-inside-edges))
-       (x-y (posn-x-y (posn-at-point))))
-    (cons (selected-frame)
-         (cons (+ (car edges)
-                  (/ (car x-y) (frame-char-width)))
-               (+ (car (cdr edges))
-                  (/ (cdr x-y) (frame-char-height)))))))
+  (let* ((edges (window-inside-edges))
+        (posn-at-point (posn-at-point))
+        (x-y (and posn-at-point (posn-x-y posn-at-point))))
+    (when x-y
+      (cons (selected-frame)
+           (cons (+ (car edges)
+                    (/ (car x-y) (frame-char-width)))
+                 (+ (car (cdr edges))
+                    (/ (cdr x-y) (frame-char-height))))))))
 
 ;(defun mouse-avoidance-point-position-test ()
 ;  (interactive)
@@ -185,19 +187,21 @@
 Acceptable distance is defined by `mouse-avoidance-threshold'."
   (let* ((frame (car mouse))
         (mouse-y (cdr (cdr mouse)))
-        (tool-bar-lines (frame-parameter nil 'tool-bar-lines)))
+        (tool-bar-lines (frame-parameter nil 'tool-bar-lines))
+        point)
     (or tool-bar-lines
        (setq tool-bar-lines 0))
-    (if (and mouse-y (< mouse-y tool-bar-lines))
-       nil
-      (let ((point (mouse-avoidance-point-position))
-           (mouse-x (car (cdr mouse))))
+    (cond
+     ((and mouse-y (< mouse-y tool-bar-lines))
+      nil)
+     ((setq point (mouse-avoidance-point-position))
+      (let ((mouse-x (car (cdr mouse))))
        (and (eq frame (car point))
             (not (null mouse-x))
             (< (abs (- mouse-x (car (cdr point))))
                mouse-avoidance-threshold)
             (< (abs (- mouse-y (cdr (cdr point))))
-               mouse-avoidance-threshold))))))
+               mouse-avoidance-threshold)))))))
 
 (defun mouse-avoidance-banish-destination ()
   "The position to which Mouse Avoidance mode `banish' moves the mouse.