X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/ddcd8e6bb4a27a17862726cd7d3955df274c19be..b56ef781d5a712fd06378f78eb9551ab9269bb2e:/beacon.el

diff --git a/beacon.el b/beacon.el
index 138c3baae..777e80998 100644
--- a/beacon.el
+++ b/beacon.el
@@ -264,11 +264,6 @@ Only returns `beacon-size' elements."
 (defvar beacon--previous-mark-head nil)
 (defvar beacon--previous-window nil)
 
-(defun beacon--pos-on-current-line-p (pos)
-  "Return non-nil if POS is on the current line."
-  (and (<= (save-excursion (beginning-of-line) (point)) pos)
-       (<= pos (save-excursion (end-of-line) (point)))))
-
 (defun beacon--movement-> (delta)
   "Return non-nil if latest point movement is > DELTA.
 If DELTA is nil, return nil."
@@ -276,23 +271,18 @@ If DELTA is nil, return nil."
        (markerp beacon--previous-place)
        (equal (marker-buffer beacon--previous-place)
               (current-buffer))
+       ;; Quick check that prevents running the code below in very
+       ;; short movements (like typing).
        (> (abs (- (point) beacon--previous-place))
           delta)
-       ;; Check if the movement was larger than DELTA lines by testing if
-       ;; `point' is still on the same line or on any line DELTA lines up or
-       ;; down.  This is much cheaper than computing the actual number of lines
-       ;; moved using `count-screen-lines'.
-       (let ((prev-pos (marker-position beacon--previous-place)))
-	 (catch 'movement
-	   (when (beacon--pos-on-current-line-p prev-pos)
-	     (throw 'movement nil))
-	   (dolist (inc '(1 -1))
-	     (save-excursion
-	       (dotimes (i delta)
-		 (vertical-motion inc)
-		 (when (beacon--pos-on-current-line-p prev-pos)
-		   (throw 'movement nil)))))
-	   (throw 'movement t)))))
+       ;; Check if the movement was >= DELTA lines by moving DELTA
+       ;; lines. `count-screen-lines' is too slow if the movement had
+       ;; thousands of lines.
+       (save-excursion
+         (goto-char (min beacon--previous-place (point)))
+         (vertical-motion delta)
+         (> (max (point) beacon--previous-place)
+            (line-beginning-position)))))
 
 (defun beacon--maybe-push-mark ()
   "Push mark if it seems to be safe."
@@ -360,11 +350,17 @@ unreliable, so just blink immediately."
   (if beacon-mode
       (progn
         (add-hook 'window-scroll-functions #'beacon--window-scroll-function)
+        (add-hook 'focus-in-hook #'beacon-blink)
         (add-hook 'post-command-hook #'beacon--post-command)
         (add-hook 'pre-command-hook #'beacon--vanish))
+    (remove-hook 'focus-in-hook #'beacon-blink)
     (remove-hook 'window-scroll-functions #'beacon--window-scroll-function)
     (remove-hook 'post-command-hook #'beacon--post-command)
     (remove-hook 'pre-command-hook #'beacon--vanish)))
 
 (provide 'beacon)
 ;;; beacon.el ends here
+
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; End: