Merge commit '98f32631ffdaa9daf735799734ad9d3565146898'

diff --combined packages/beacon/beacon.el
index 422614919bda9ca9760b50a20bf8cffdf77e0790,a4024a04385597684ca67fa037d2ebfffb3dc6c1..a4024a04385597684ca67fa037d2ebfffb3dc6c1
--- 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: 1.0
+ ;; Version: 1.2
  ;; Package-Requires: ((seq "1.11"))
  
  ;; This program is free software; you can redistribute it and/or modify
@@@ -236,7 -236,7 +236,7 @@@ COLORS applied to each one.
             (seq-filter (lambda (o) (overlay-get o 'beacon))
                         (overlays-at (point))))))
  
- (defun beacon--vanish ()
+ (defun beacon--vanish (&rest _)
    "Turn off the beacon."
    (when (timerp beacon--timer)
      (cancel-timer beacon--timer))
@@@ -387,6 -387,11 +387,11 @@@ The same is true for DELTA-X and horizo
    (cond
     ;; Sanity check.
     ((not (markerp beacon--previous-place)))
+    ;; Blink for switching buffers.
+    ((and beacon-blink-when-buffer-changes
+          (not (eq (marker-buffer beacon--previous-place)
+                   (current-buffer))))
+     (beacon-blink-automated))
     ;; Blink for switching windows.
     ((and beacon-blink-when-window-changes
           (not (eq beacon--previous-window (selected-window))))
@@@ -443,11 -448,13 +448,13 @@@ unreliable, so just blink immediately.
          (add-hook 'window-scroll-functions #'beacon--window-scroll-function)
          (add-hook 'focus-in-hook #'beacon--blink-on-focus)
          (add-hook 'post-command-hook #'beacon--post-command)
+         (add-hook 'before-change-functions #'beacon--vanish)
          (add-hook 'pre-command-hook #'beacon--record-vars)
          (add-hook 'pre-command-hook #'beacon--vanish))
      (remove-hook 'focus-in-hook #'beacon--blink-on-focus)
      (remove-hook 'window-scroll-functions #'beacon--window-scroll-function)
      (remove-hook 'post-command-hook #'beacon--post-command)
+     (remove-hook 'before-change-functions #'beacon--vanish)
      (remove-hook 'pre-command-hook #'beacon--record-vars)
      (remove-hook 'pre-command-hook #'beacon--vanish)))