diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-22 11:04:37 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-22 11:04:37 -0700 |
| commit | d2ea891fca9d78553426f202ae6e1dd0047f693f (patch) | |
| tree | f6c43b1f10e9db32b89de9c3c809a0f8699224f4 /lisp/emacs-lisp | |
| parent | 656058b790c285aa037a772f752c1446e7423ba2 (diff) | |
| parent | 91e667692ba1362ca1334b8d58fd16c305ad5e2a (diff) | |
| download | emacs-d2ea891fca9d78553426f202ae6e1dd0047f693f.tar.gz emacs-d2ea891fca9d78553426f202ae6e1dd0047f693f.tar.bz2 emacs-d2ea891fca9d78553426f202ae6e1dd0047f693f.zip | |
Merge from origin/emacs-25
91e6676 Fix an Isearch var to be a string (Bug#23038)
76ef522 Fix (args-out-of-range 1) error in cursor-sensor--detect
Diffstat (limited to 'lisp/emacs-lisp')
| -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 ac063d4896a..f1ab82ecc4a 100644 --- a/lisp/emacs-lisp/cursor-sensor.el +++ b/lisp/emacs-lisp/cursor-sensor.el @@ -113,7 +113,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 (= point 1) + (unless (bobp) (get-char-property (1- point) 'cursor-sensor-functions)))) (old (window-parameter window 'cursor-sensor--last-state)) (oldposmark (car old)) |