Merge commit 'd4a9dad594473c511f975017d792efc8a8339671'

diff --combined packages/beacon/beacon.el
index 23d292ecc74241446329186a411a3af5ee188511,7b2289f406268493785f3a3cbed24c6221cbd684..7b2289f406268493785f3a3cbed24c6221cbd684
--- 1/packages/beacon/beacon.el
--- 2/beacon.el
+++ b/packages/beacon/beacon.el
@@@ -5,7 -5,7 +5,7 @@@
  ;; Author: Artur Malabarba <emacs@endlessparentheses.com>
  ;; URL: https://github.com/Malabarba/beacon
  ;; Keywords: convenience
- ;; Version: 0.6
+ ;; Version: 0.6.1
  ;; Package-Requires: ((seq "1.11"))
  
  ;; This program is free software; you can redistribute it and/or modify
@@@ -310,10 -310,26 +310,26 @@@ Only returns `beacon-size' elements.
               (beacon--ov-put-after-string o colors)
               (forward-char 1))))))))
  
+ ;;;###autoload
  (defun beacon-blink ()
-   "Blink the beacon at the position of the cursor."
+   "Blink the beacon at the position of the cursor.
+ Unlike `beacon-blink-automated', the beacon will blink
+ unconditionally (even if `beacon-mode' is disabled), and this can
+ be invoked as a user command or called from lisp code."
    (interactive)
    (beacon--vanish)
+   (beacon--shine)
+   (setq beacon--timer
+         (run-at-time beacon-blink-delay
+                      (/ beacon-blink-duration 1.0 beacon-size)
+                      #'beacon--dec)))
+ 
+ (defun beacon-blink-automated ()
+   "If appropriate, blink the beacon at the position of the cursor.
+ Unlike `beacon-blink', the blinking is conditioned on a series of
+ variables: `beacon-mode', `beacon-dont-blink-commands',
+ `beacon-dont-blink-major-modes', and
+ `beacon-dont-blink-predicates'."
    ;; Record vars here in case something is blinking outside the
    ;; command loop.
    (beacon--record-vars)
@@@ -321,11 -337,7 +337,7 @@@
                (run-hook-with-args-until-success 'beacon-dont-blink-predicates)
                (seq-find #'derived-mode-p beacon-dont-blink-major-modes)
                (memq (or this-command last-command) beacon-dont-blink-commands))
-     (beacon--shine)
-     (setq beacon--timer
-           (run-at-time beacon-blink-delay
-                        (/ beacon-blink-duration 1.0 beacon-size)
-                        #'beacon--dec))))
+     (beacon-blink)))
  
  \f
  ;;; Movement detection
@@@ -375,15 -387,15 +387,15 @@@ The same is true for DELTA-X and horizo
     ;; Blink for switching windows.
     ((and beacon-blink-when-window-changes
           (not (eq beacon--previous-window (selected-window))))
-     (beacon-blink))
+     (beacon-blink-automated))
     ;; Blink for scrolling.
     ((and beacon--window-scrolled
           (equal beacon--window-scrolled (selected-window)))
-     (beacon-blink))
+     (beacon-blink-automated))
     ;; Blink for movement
     ((beacon--movement-> beacon-blink-when-point-moves-vertically
                    beacon-blink-when-point-moves-horizontally)
-     (beacon-blink)))
+     (beacon-blink-automated)))
    (beacon--maybe-push-mark)
    (setq beacon--window-scrolled nil))
  
@@@ -402,12 -414,12 +414,12 @@@ unreliable, so just blink immediately.
      (if this-command
          (setq beacon--window-scrolled win)
        (setq beacon--window-scrolled nil)
-       (beacon-blink))))
+       (beacon-blink-automated))))
  
  (defun beacon--blink-on-focus ()
    "Blink if `beacon-blink-when-focused' is non-nil"
    (when beacon-blink-when-focused
-     (beacon-blink)))
+     (beacon-blink-automated)))
  
  \f
  ;;; Minor-mode