diff options
| author | Julien Danjou | 2010-10-18 17:10:38 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2010-10-18 17:10:38 -0400 |
| commit | 36ba6f0730619d7aef25f094418cff7b4c86f72a (patch) | |
| tree | 6c6de43c761aa3967a5f20b0e41f63172d75955b | |
| parent | c978536f741b75ff44639f723984abf983d9063a (diff) | |
| download | emacs-36ba6f0730619d7aef25f094418cff7b4c86f72a.tar.gz emacs-36ba6f0730619d7aef25f094418cff7b4c86f72a.zip | |
* lisp/avoid.el (mouse-avoidance-ignore-p): Ignore mouse when it is
hidden by `make-pointer-invisible'.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/avoid.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b7a06b309cf..949e7d40e3d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-10-18 Julien Danjou <julien@danjou.info> | ||
| 2 | |||
| 3 | * avoid.el (mouse-avoidance-ignore-p): Ignore mouse when it is | ||
| 4 | hidden by `make-pointer-invisible'. | ||
| 5 | |||
| 1 | 2010-10-18 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2010-10-18 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * files.el (locate-file-completion-table): Strip non-matching elements | 8 | * files.el (locate-file-completion-table): Strip non-matching elements |
diff --git a/lisp/avoid.el b/lisp/avoid.el index adfb1dd78c8..4b713b827b6 100644 --- a/lisp/avoid.el +++ b/lisp/avoid.el | |||
| @@ -278,7 +278,8 @@ redefine this function to suit your own tastes." | |||
| 278 | 278 | ||
| 279 | (defun mouse-avoidance-ignore-p () | 279 | (defun mouse-avoidance-ignore-p () |
| 280 | (let ((mp (mouse-position))) | 280 | (let ((mp (mouse-position))) |
| 281 | (or executing-kbd-macro ; don't check inside macro | 281 | (or (not (frame-pointer-visible-p)) ; The pointer is hidden |
| 282 | executing-kbd-macro ; don't check inside macro | ||
| 282 | (null (cadr mp)) ; don't move unless in an Emacs frame | 283 | (null (cadr mp)) ; don't move unless in an Emacs frame |
| 283 | (not (eq (car mp) (selected-frame))) | 284 | (not (eq (car mp) (selected-frame))) |
| 284 | ;; Don't do anything if last event was a mouse event. | 285 | ;; Don't do anything if last event was a mouse event. |