Merge from origin/emacs-25

35ce3fb Don't assume window-point and point are the same
This commit is contained in:
Paul Eggert 2016-12-07 12:41:05 -08:00
commit c102a84a48

View file

@ -114,7 +114,7 @@
;; 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 (bobp)
(unless (<= (point-min) point)
(get-char-property (1- point) 'cursor-sensor-functions))))
(old (window-parameter window 'cursor-sensor--last-state))
(oldposmark (car old))