Skip to content

Some solutions to misconfiguration #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
psionic-k wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Some solutions to misconfiguration #94

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0f2acb
Check delta-y and delta-x type to protect from misconfiguration
psionic-k Nov 7, 2023
e07416d
Warn the user if misconfiguration detected
psionic-k Nov 7, 2023
5fd72ee
Fail and refuse to start mode if misconfiguration detected
psionic-k Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions beacon.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,13 @@ variables: `beacon-mode', `beacon-dont-blink-commands',
"Return non-nil if latest vertical movement is > DELTA-Y.
If DELTA-Y is nil, return nil.
The same is true for DELTA-X and horizonta movement."
(and delta-y

(when (and delta-y (not (numberp delta-y)))
(warn "beacon-blink-when-point-moves-vertically is not an integer."))
(when (and delta-x (not (numberp delta-x)))
(warn "beacon-blink-when-point-moves-horizontally is not an integer."))

(and (numberp delta-y)
(markerp beacon--previous-place)
(equal (marker-buffer beacon--previous-place)
(current-buffer))
Expand All @@ -387,7 +393,7 @@ The same is true for DELTA-X and horizonta movement."
(> (abs (- (point) beacon--previous-place))
delta-y)
;; Col movement.
(or (and delta-x
(or (and (numberp delta-x)
(> (abs (- (current-column)
(save-excursion
(goto-char beacon--previous-place)
Expand Down Expand Up @@ -475,6 +481,18 @@ unreliable, so just blink immediately."
:global t
(if beacon-mode
(progn
;; Fail when misconfigured.
(when (and beacon-blink-when-point-moves-horizontally
(not (numberp beacon-blink-when-point-moves-horizontally)))
(user-error
"When non-nil, beacon-blink-when-point-moves-horizontally is not an integer: %s"
beacon-blink-when-point-moves-horizontally))
(when (and beacon-blink-when-point-moves-vertically
(not (numberp beacon-blink-when-point-moves-vertically)))
(user-error
"When non-nil, beacon-blink-when-point-moves-vertically is not an integer: %s"
beacon-blink-when-point-moves-vertically))

(add-hook 'window-scroll-functions #'beacon--window-scroll-function)
(add-function :after after-focus-change-function
#'beacon--blink-on-focus)
Expand Down