diff options
| author | Paul Eggert | 2016-12-07 12:41:05 -0800 |
|---|---|---|
| committer | Paul Eggert | 2016-12-07 12:41:05 -0800 |
| commit | c102a84a48cf91f6ffde43270ff34b37fdada8dd (patch) | |
| tree | 6b7977aa4f1835921c600a2d4258cca836236211 | |
| parent | 33a2f93aadc8da93ca5948c6b312eb3e1df25bf1 (diff) | |
| parent | 35ce3fb141dd72f75408e71f2daba9b513ca89f2 (diff) | |
| download | emacs-c102a84a48cf91f6ffde43270ff34b37fdada8dd.tar.gz emacs-c102a84a48cf91f6ffde43270ff34b37fdada8dd.zip | |
Merge from origin/emacs-25
35ce3fb Don't assume window-point and point are the same
| -rw-r--r-- | lisp/emacs-lisp/cursor-sensor.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/cursor-sensor.el b/lisp/emacs-lisp/cursor-sensor.el index 2231179de1c..28b61880d0a 100644 --- a/lisp/emacs-lisp/cursor-sensor.el +++ b/lisp/emacs-lisp/cursor-sensor.el | |||
| @@ -114,7 +114,7 @@ | |||
| 114 | ;; non-sticky on both ends, but that means get-pos-property might | 114 | ;; non-sticky on both ends, but that means get-pos-property might |
| 115 | ;; never see it. | 115 | ;; never see it. |
| 116 | (new (or (get-char-property point 'cursor-sensor-functions) | 116 | (new (or (get-char-property point 'cursor-sensor-functions) |
| 117 | (unless (bobp) | 117 | (unless (<= (point-min) point) |
| 118 | (get-char-property (1- point) 'cursor-sensor-functions)))) | 118 | (get-char-property (1- point) 'cursor-sensor-functions)))) |
| 119 | (old (window-parameter window 'cursor-sensor--last-state)) | 119 | (old (window-parameter window 'cursor-sensor--last-state)) |
| 120 | (oldposmark (car old)) | 120 | (oldposmark (car old)) |