[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 9152a09 08/34: Separate mark-pushing from blinking
From: |
Artur Malabarba |
Subject: |
[elpa] master 9152a09 08/34: Separate mark-pushing from blinking |
Date: |
Fri, 16 Oct 2015 09:56:50 +0000 |
branch: master
commit 9152a09f7ef5cce9199a0dc1253377d40f6857ef
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>
Separate mark-pushing from blinking
---
beacon.el | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/beacon.el b/beacon.el
index 34dba38..f081934 100644
--- a/beacon.el
+++ b/beacon.el
@@ -158,10 +158,22 @@ Only returns `beacon-size' elements."
(defvar beacon--previous-window-start nil)
(defvar beacon--previous-mark-head nil)
+(defun beacon--movement-> (delta)
+ "Return non-nil if latest point movement is > DELTA.
+If DELTA is nil, return nil."
+ (and delta
+ (equal (marker-buffer beacon--previous-place)
+ (current-buffer))
+ (> (abs (- (point) beacon--previous-place))
+ delta)
+ (> (count-screen-lines (min (point) beacon--previous-place)
+ (max (point) beacon--previous-place))
+ delta)))
+
(defun beacon--maybe-push-mark ()
"Push mark if it seems to be safe."
- (when (and beacon-push-mark
- (not mark-active))
+ (when (and (not mark-active)
+ (beacon--movement-> beacon-push-mark))
(let ((head (car mark-ring)))
(when (and (eq beacon--previous-mark-head head)
(not (equal head beacon--previous-place)))
@@ -182,18 +194,13 @@ Only returns `beacon-size' elements."
((and beacon-blink-when-window-scrolls
(progn (redisplay)
(not (equal beacon--previous-window-start (window-start)))))
- (beacon--maybe-push-mark)
(beacon-blink))
;; Blink for movement
- ((and beacon-blink-when-point-moves
- (> (abs (- (point) beacon--previous-place))
- beacon-blink-when-point-moves)
- (> (count-screen-lines (min (point) beacon--previous-place)
- (max (point) beacon--previous-place))))
- (beacon--maybe-push-mark)
+ ((beacon--movement-> beacon-blink-when-point-moves)
(beacon-blink))
;; Even if we don't blink, vanish any previous beacon.
(t (beacon--vanish)))
+ (beacon--maybe-push-mark)
(unless (window-minibuffer-p)
(setq beacon--previous-window-start (window-start))
(setq beacon--previous-mark-head (car mark-ring))
- [elpa] master 3022997 02/34: Rename to beacon, (continued)
- [elpa] master 3022997 02/34: Rename to beacon, Artur Malabarba, 2015/10/16
- [elpa] master 36be965 09/34: Make beacon color customizable, Artur Malabarba, 2015/10/16
- [elpa] master 43cbfd4 15/34: Merge pull request #3 from tsdh/master, Artur Malabarba, 2015/10/16
- [elpa] master 8abbedc 05/34: Default to blinking on window scroll instead of point movement, Artur Malabarba, 2015/10/16
- [elpa] master fbcf9fc 16/34: Drop cl-lib dep, Artur Malabarba, 2015/10/16
- [elpa] master 19096a6 10/34: Initial (failed) impl for beacon at end of line, Artur Malabarba, 2015/10/16
- [elpa] master e533e04 11/34: Fix an error, Artur Malabarba, 2015/10/16
- [elpa] master 03d12b4 03/34: Rename file, Artur Malabarba, 2015/10/16
- [elpa] master 8941740 07/34: Fix docs, Artur Malabarba, 2015/10/16
- [elpa] master c82095a 06/34: Add url, Artur Malabarba, 2015/10/16
- [elpa] master 9152a09 08/34: Separate mark-pushing from blinking,
Artur Malabarba <=
- [elpa] master b60416c 01/34: First commit, Artur Malabarba, 2015/10/16
- [elpa] master ca3ec24 14/34: Fix temporary line breaks due to too long after-strings, Artur Malabarba, 2015/10/16
- [elpa] master c507480 13/34: Fix after-string overlays, Artur Malabarba, 2015/10/16
- [elpa] master 02112fa 12/34: Fix lighter, Artur Malabarba, 2015/10/16
- [elpa] master f1bb231 20/34: Fix scrolling outside command loop, Artur Malabarba, 2015/10/16
- [elpa] master 0b7041e 22/34: More documentation, Artur Malabarba, 2015/10/16
- [elpa] master 5622af4 25/34: [#2] Add more options for preventing a blink, Artur Malabarba, 2015/10/16
- [elpa] master 6f647f6 21/34: Only blink selected window, Artur Malabarba, 2015/10/16
- [elpa] master 0036355 23/34: Copyright, Artur Malabarba, 2015/10/16
- [elpa] master bccd3de 33/34: Document contributors, Artur Malabarba, 2015/10/16