[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master c102a84 15/18: Merge from origin/emacs-25
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master c102a84 15/18: Merge from origin/emacs-25 |
Date: |
Wed, 7 Dec 2016 20:54:05 +0000 (UTC) |
branch: master
commit c102a84a48cf91f6ffde43270ff34b37fdada8dd
Merge: 33a2f93 35ce3fb
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Merge from origin/emacs-25
35ce3fb Don't assume window-point and point are the same
---
lisp/emacs-lisp/cursor-sensor.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lisp/emacs-lisp/cursor-sensor.el b/lisp/emacs-lisp/cursor-sensor.el
index 2231179..28b6188 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))
- [Emacs-diffs] master 8cd0d5d 10/18: ; Merge from origin/emacs-25, (continued)
- [Emacs-diffs] master 8cd0d5d 10/18: ; Merge from origin/emacs-25, Paul Eggert, 2016/12/07
- [Emacs-diffs] master e22eabd 12/18: ; Merge from origin/emacs-25, Paul Eggert, 2016/12/07
- [Emacs-diffs] master 8209e03 06/18: ; Merge from origin/emacs-25, Paul Eggert, 2016/12/07
- [Emacs-diffs] master 99e20f1 13/18: Merge from origin/emacs-25, Paul Eggert, 2016/12/07
- [Emacs-diffs] master 32b46fc 08/18: ; Merge from origin/emacs-25, Paul Eggert, 2016/12/07
- [Emacs-diffs] master 3ace6b1 05/18: Merge from origin/emacs-25, Paul Eggert, 2016/12/07
- [Emacs-diffs] master fd6632b 07/18: Merge from origin/emacs-25, Paul Eggert, 2016/12/07
- [Emacs-diffs] master fe6131b 16/18: ; Merge from origin/emacs-25, Paul Eggert, 2016/12/07
- [Emacs-diffs] master c5532f5 09/18: Merge from origin/emacs-25, Paul Eggert, 2016/12/07
- [Emacs-diffs] master e676b7b 11/18: Merge from origin/emacs-25, Paul Eggert, 2016/12/07
- [Emacs-diffs] master c102a84 15/18: Merge from origin/emacs-25,
Paul Eggert <=
- [Emacs-diffs] master f15f6b5 17/18: Merge from origin/emacs-25, Paul Eggert, 2016/12/07
- [Emacs-diffs] master c266058 01/18: Merge from origin/emacs-25, Paul Eggert, 2016/12/07
- [Emacs-diffs] master aed629d 18/18: Put post-25 ChangeLog entries into ChangeLog.3, Paul Eggert, 2016/12/07