Drop cl-lib dep

[gnu-emacs-elpa] / beacon.el

diff --git a/beacon.el b/beacon.el
index 39354765de8a20bb9cab9dc7962e732cae49ae34..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."
@@ -98,24 +98,35 @@ e.g. \"#666600\"."
   "Add an after-string property to OVERLAY.
 The property's value is a string of spaces with background
 COLORS applied to each one."
-  (overlay-put overlay 'beacon-colors colors)
-  (overlay-put overlay 'after-string
-               (mapconcat (lambda (c) (propertize " " 'face (list :background c)))
-                          colors
-                          "")))
+  (if (not colors)
+      (delete-overlay overlay)
+    (overlay-put overlay 'beacon-colors colors)
+    (overlay-put overlay 'after-string
+                 (propertize
+                  (mapconcat (lambda (c) (propertize " " 'face (list :background c)))
+                             colors
+                             "")
+                  'cursor 1000))))
 
 (defun beacon--after-string-overlay (colors)
   "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 (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."
@@ -164,19 +175,22 @@ Only returns `beacon-size' elements."
 
 (defun beacon--dec ()
   "Decrease the beacon brightness by one."
-  (let ((o (beacon--ov-at-point)))
-    (if (not o)
-        (beacon--vanish)
-      (delete-overlay o)
-      (save-excursion
-        (while (progn (forward-char 1)
-                      (setq o (beacon--ov-at-point)))
-          (let ((colors (overlay-get o 'beacon-colors)))
-            (if (not colors)
-                (move-overlay o (1- (point)) (point))
-              (forward-char -1)
-              (beacon--colored-overlay (pop colors))
-              (beacon--ov-put-after-string o colors))))))))
+  (pcase (beacon--ov-at-point)
+    (`nil (beacon--vanish))
+    ((and o (let c (overlay-get o 'beacon-colors)) (guard c))
+     (beacon--ov-put-after-string o (cdr c)))
+    (o
+     (delete-overlay o)
+     (save-excursion
+       (while (progn (forward-char 1)
+                     (setq o (beacon--ov-at-point)))
+         (let ((colors (overlay-get o 'beacon-colors)))
+           (if (not colors)
+               (move-overlay o (1- (point)) (point))
+             (forward-char -1)
+             (beacon--colored-overlay (pop colors))
+             (beacon--ov-put-after-string o colors)
+             (forward-char 1))))))))
 
 (defun beacon-blink ()
   "Blink the beacon at the position of the cursor."