[elpa] master 6f7aa26 3/3: Merge commit '3c14fa39c9233e64b598a7ca3af243c7395eccdb'

[Artur Malabarba]

branch: master
commit 6f7aa2669e1f2fdda4269b31fa44fb41cf01a8cf
Merge: 6934762 3c14fa3
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>

    Merge commit '3c14fa39c9233e64b598a7ca3af243c7395eccdb'
---
 packages/beacon/beacon.el |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/beacon/beacon.el b/packages/beacon/beacon.el
index afbe144..66853ca 100644
--- a/packages/beacon/beacon.el
+++ b/packages/beacon/beacon.el
@@ -46,7 +46,7 @@
 
 (defvar beacon--timer nil)
 
-(defcustom beacon-push-mark nil
+(defcustom beacon-push-mark 35
   "Should the mark be pushed before long movements?
 If nil, `beacon' will not push the mark.
 Otherwise this should be a number, and `beacon' will push the
@@ -96,7 +96,7 @@ If it is a string, it is a color name or specification,
 e.g. \"#666600\"."
   :type '(choice number color))
 
-(defcustom beacon-dont-blink-predicates nil
+(defvar beacon-dont-blink-predicates nil
   "A list of predicates that prevent the beacon blink.
 These predicate functions are called in order, with no
 arguments, before blinking the beacon.  If any returns
@@ -105,9 +105,8 @@ non-nil, the beacon will not blink.
 For instance, if you want to disable beacon on buffers where
 `hl-line-mode' is on, you can do:
 
-    (add-hook 'beacon-dont-blink-predicates
-              (lambda () (bound-and-true-p hl-line-mode)))"
-  :type 'hook)
+    (add-hook \\='beacon-dont-blink-predicates
+              (lambda () (bound-and-true-p hl-line-mode)))")
 
 (add-hook 'beacon-dont-blink-predicates #'window-minibuffer-p)