diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-02-26 10:39:15 +0000 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-02-26 10:39:15 +0000 |
| commit | 3e1ec5d87de2953a8ba0d08602a45b050641ef47 (patch) | |
| tree | 0ab301c74a990e8001d400ef4f9356379b33fdc1 /lisp/emacs-lisp/cursor-sensor.el | |
| parent | 48b131c6d17383eed4b09634e4dddf226b0cd3cd (diff) | |
| parent | 4a94881345819dd68062bc729b5b7ddeab00041b (diff) | |
| download | emacs-3e1ec5d87de2953a8ba0d08602a45b050641ef47.tar.gz emacs-3e1ec5d87de2953a8ba0d08602a45b050641ef47.tar.bz2 emacs-3e1ec5d87de2953a8ba0d08602a45b050641ef47.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp/cursor-sensor.el')
| -rw-r--r-- | lisp/emacs-lisp/cursor-sensor.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/cursor-sensor.el b/lisp/emacs-lisp/cursor-sensor.el index d8e8eeb16ef..7728e78c471 100644 --- a/lisp/emacs-lisp/cursor-sensor.el +++ b/lisp/emacs-lisp/cursor-sensor.el @@ -146,9 +146,10 @@ By convention, this is a list of symbols where each symbol stands for the ;; It's often desirable to make the cursor-sensor-functions property ;; non-sticky on both ends, but that means get-pos-property might ;; never see it. - (new (or (get-char-property point 'cursor-sensor-functions) - (unless (<= (point-min) point) - (get-char-property (1- point) 'cursor-sensor-functions)))) + (new (and (eq (current-buffer) (window-buffer)) + (or (get-char-property point 'cursor-sensor-functions) + (unless (<= (point-min) point) + (get-char-property (1- point) 'cursor-sensor-functions))))) (old (window-parameter window 'cursor-sensor--last-state)) (oldposmark (car old)) (oldpos (or (if oldposmark (marker-position oldposmark)) |