branch: externals/tempel
commit 8f8588985a38bd424a2c5acf506bf2e126be8015
Author: Daniel Mendler <[email protected]>
Commit: Daniel Mendler <[email protected]>
Simplify template markers
---
tempel.el | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/tempel.el b/tempel.el
index 92a7b520e2..057a9374cb 100644
--- a/tempel.el
+++ b/tempel.el
@@ -92,22 +92,14 @@
(when-let* ((name (intern-soft name))
(template (cdr (assoc name templates))))
(setf (alist-get 'tempo-marks minor-mode-overriding-map-alist) tempel-map)
- (let ((tempel--current template)
- (old-point (point))
- (split-overlays nil)
- (old-marks (copy-sequence tempo-marks)))
- (dolist (ov tempel--overlays)
- (when (and (<= (overlay-start ov) old-point) (>= (overlay-end ov)
old-point))
- (push ov split-overlays)))
+ (let ((tempel--current template))
+ (mapc #'delete-overlay tempel--overlays)
+ (setq tempel--overlays nil)
(tempo-insert-template 'tempel--current region)
- (dolist (ov split-overlays)
- (setf (overlay-end ov) old-point))
(dolist (x tempo-marks)
- (unless (member x old-marks)
- (let ((ov (make-overlay x x nil nil t)))
- (overlay-put ov 'face '(:underline t))
- (overlay-put ov 'before-string #(" " 0 1 (face highlight display
(space :width (1)))))
- (push ov tempel--overlays)))))))
+ (let ((ov (make-overlay x x)))
+ (overlay-put ov 'before-string #(" " 0 1 (face highlight display
(space :width (1)))))
+ (push ov tempel--overlays))))))
(defun tempel--save ()
"Save Tempo file buffer."