From 5b57bb47d0d7daf3a9d2fe772eb03793f4f76505 Mon Sep 17 00:00:00 2001 From: Thomas Voss Date: Thu, 11 Dec 2025 15:24:47 +0100 Subject: emacs: Begin work on new marker module --- .config/emacs/site-lisp/marker.el | 50 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 .config/emacs/site-lisp/marker.el (limited to '.config/emacs/site-lisp/marker.el') diff --git a/.config/emacs/site-lisp/marker.el b/.config/emacs/site-lisp/marker.el new file mode 100644 index 0000000..5bc1dd2 --- /dev/null +++ b/.config/emacs/site-lisp/marker.el @@ -0,0 +1,50 @@ +(require 'hi-lock) +(require 'seq) + +(defvar-local marker--overlays nil) + +(defun marker-mark () + (interactive) + (marker-mark-region (if (use-region-p) + (region-bounds) + `((,(pos-bol) . ,(pos-eol))))) + (when (region-active-p) + (deactivate-mark))) + +(defun marker-mark-region (bounds) + (dolist (x bounds) (marker--mark-region (car x) (cdr x)))) + +(defun marker--mark-region (beg end) + (let ((ov (make-overlay beg end nil :front-advance))) + (overlay-put ov 'priority 1) + (overlay-put ov 'face 'hi-yellow) + (overlay-put ov 'evaporate t) + (push ov marker--overlays))) + +(defun marker-unmark () + (interactive) + (marker-unmark-region (if (use-region-p) + (region-bounds) + `((,(pos-bol) . ,(pos-eol))))) + (when (region-active-p) + (deactivate-mark))) + +(defun marker-unmark-region (bounds) + (dolist (x bounds) (marker--unmark-region (car x) (cdr x)))) + +(defun marker--unmark-region (beg end) + (dolist (ov (seq-filter (lambda (ov) (memq ov marker--overlays)) + (overlays-in beg end))) + (cond ((< (overlay-start ov) beg) + (move-overlay ov (overlay-start ov) beg)) + ((> (overlay-end ov) end) + (move-overlay ov end (overlay-end ov))) + (:else + (delete-overlay ov))))) + +(defun marker-clear () + (interactive) + (mapc #'delete-overlay marker--overlays) + (setq marker--overlays nil)) + +(provide 'marker) -- cgit v1.2.3 From dad93f009a27699ffc58c7949cd826d3c1487136 Mon Sep 17 00:00:00 2001 From: Thomas Voss Date: Thu, 11 Dec 2025 15:32:06 +0100 Subject: emacs: Optimize marking code a bit --- .config/emacs/site-lisp/marker.el | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to '.config/emacs/site-lisp/marker.el') diff --git a/.config/emacs/site-lisp/marker.el b/.config/emacs/site-lisp/marker.el index 5bc1dd2..f39cad4 100644 --- a/.config/emacs/site-lisp/marker.el +++ b/.config/emacs/site-lisp/marker.el @@ -1,8 +1,6 @@ (require 'hi-lock) (require 'seq) -(defvar-local marker--overlays nil) - (defun marker-mark () (interactive) (marker-mark-region (if (use-region-p) @@ -19,13 +17,13 @@ (overlay-put ov 'priority 1) (overlay-put ov 'face 'hi-yellow) (overlay-put ov 'evaporate t) - (push ov marker--overlays))) + (overlay-put ov 'marker--mark-p t))) (defun marker-unmark () (interactive) - (marker-unmark-region (if (use-region-p) - (region-bounds) - `((,(pos-bol) . ,(pos-eol))))) + (if (use-region-p) + (marker-unmark-region (region-bounds)) + (marker-clear)) (when (region-active-p) (deactivate-mark))) @@ -33,7 +31,7 @@ (dolist (x bounds) (marker--unmark-region (car x) (cdr x)))) (defun marker--unmark-region (beg end) - (dolist (ov (seq-filter (lambda (ov) (memq ov marker--overlays)) + (dolist (ov (seq-filter (lambda (ov) (overlay-get ov 'marker--mark-p)) (overlays-in beg end))) (cond ((< (overlay-start ov) beg) (move-overlay ov (overlay-start ov) beg)) @@ -44,7 +42,6 @@ (defun marker-clear () (interactive) - (mapc #'delete-overlay marker--overlays) - (setq marker--overlays nil)) + (remove-overlays nil nil 'marker--mark-p t)) (provide 'marker) -- cgit v1.2.3