summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-12-07 12:41:05 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2016-12-07 12:41:05 -0800
commitc102a84a48cf91f6ffde43270ff34b37fdada8dd (patch)
tree6b7977aa4f1835921c600a2d4258cca836236211
parent33a2f93aadc8da93ca5948c6b312eb3e1df25bf1 (diff)
parent35ce3fb141dd72f75408e71f2daba9b513ca89f2 (diff)
downloademacs-c102a84a48cf91f6ffde43270ff34b37fdada8dd.tar.gz
emacs-c102a84a48cf91f6ffde43270ff34b37fdada8dd.tar.bz2
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.el2
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 @@
;; 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))