From 0ca1b0a8d9ab0a7d687a9f2edb6eae2e57851129 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Fri, 28 Jun 2019 14:56:07 +0100 Subject: loop->cl-loop --- NEWS.md | 5 +++++ org-d20.el | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/NEWS.md b/NEWS.md index e4e512d..3455f37 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,8 @@ +0.4 (unreleased) +---------------- + +- Replace some calls to `loop` with calls to `cl-loop`. + 0.3 (2019-04-15) ---------------- diff --git a/org-d20.el b/org-d20.el index 55f05eb..59d7f4f 100644 --- a/org-d20.el +++ b/org-d20.el @@ -4,7 +4,7 @@ ;; Author: Sean Whitton ;; URL: https://spwhitton.name/tech/code/org-d20/ -;; Version: 0.3 +;; Version: 0.4 ;; Package-Requires: ((s "1.11.0") (seq "2.19") (dash "2.12.0") (emacs "24")) ;; Keywords: outlines games @@ -47,6 +47,7 @@ (require 's) (require 'seq) (require 'dash) +(require 'cl-lib) (require 'org-table) (defgroup org-d20 nil @@ -224,7 +225,7 @@ the best N of them, e.g., 4d6k3." (interactive "*") (let ((rows)) (let (name-input init-input hd-input num-input (monster 1)) - (loop + (cl-loop do (setq name-input (read-string "Monster/NPC name (blank when done): ")) (when (> (length name-input) 0) (setq init-input (read-string (concat name-input "'s init modifier: ")) @@ -276,7 +277,7 @@ the best N of them, e.g., 4d6k3." "Advance the turn tracker in an initiative table." (interactive "*") (when (org-at-table-p) - (loop + (cl-loop do (let* ((back (search-backward ">>>>" (org-table-begin) t)) (forward (search-forward ">>>>" (org-table-end) t)) (cur (if back back forward))) -- cgit v1.2.3