Drop cl-lib dep

[gnu-emacs-elpa] / beacon.el

diff --git a/beacon.el b/beacon.el
index 25a1b9e5e6f8c2958282315b66f352312d60ac56..8a997a1c5dcc392ced9dfaf6322e085f42337c61 100644 (file)
--- a/beacon.el
+++ b/beacon.el
@@ -6,7 +6,7 @@
 ;; URL: https://github.com/Malabarba/beacon
 ;; Keywords: convenience
 ;; Version: 0.1
-;; Package-Requires: ((cl-lib "0.5"))
+;; Package-Requires: ((seq "1.9"))
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 
 ;;; Code:
 
-(require 'cl-lib)
+(require 'seq)
 
 (defgroup beacon nil
   "Customization group for beacon."
@@ -112,16 +112,21 @@ COLORS applied to each one."
   "Put an overlay at point with an after-string property.
 The property's value is a string of spaces with background
 COLORS applied to each one."
-  (let ((ov (make-overlay (point) (point))))
+  (let ((ov (make-overlay (point) (point)))
+        ;; The after-string must not be longer than the remaining columns from
+        ;; point to right window-end else it will be wrapped around (assuming
+        ;; truncate-lines is nil) introducing an ugly wrap-around for a
+        ;; fraction of a second.
+        (colors (seq-take colors (- (window-width) (current-column)))))
     (beacon--ov-put-after-string ov colors)
     (overlay-put ov 'beacon t)
     (push ov beacon--ovs)))
 
 (defun beacon--ov-at-point ()
-  (car (or (cl-member-if (lambda (o) (overlay-get o 'beacon))
-                         (overlays-in (point) (point)))
-           (cl-member-if (lambda (o) (overlay-get o 'beacon))
-                         (overlays-at (point))))))
+  (car (or (seq-filter (lambda (o) (overlay-get o 'beacon))
+                     (overlays-in (point) (point)))
+           (seq-filter (lambda (o) (overlay-get o 'beacon))
+                     (overlays-at (point))))))
 
 (defun beacon--vanish ()
   "Turn off the beacon."