From 195576bdbffe76e719a49802fa61d04a3a7df5ad Mon Sep 17 00:00:00 2001 From: Nathaniel Nicandro Date: Mon, 10 Jun 2019 12:56:21 -0500 Subject: [PATCH] jupyter-org--ansi-color-apply-on-region: Use `cond` --- jupyter-org-client.el | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/jupyter-org-client.el b/jupyter-org-client.el index 8697bf0..8529dbe 100644 --- a/jupyter-org-client.el +++ b/jupyter-org-client.el @@ -544,21 +544,22 @@ property." next begin1 end1) (while (/= begin end) (setq next (next-single-property-change begin 'jupyter-ansi nil end)) - (if (get-text-property begin 'jupyter-ansi) - (progn - (setq begin1 begin - end1 next - begin next) - (while (/= begin1 end1) - (setq next (next-single-property-change - begin1 'font-lock-face nil end1)) - (when (get-text-property begin1 'font-lock-face) - (font-lock-prepend-text-property - begin1 next 'face (get-text-property begin1 'font-lock-face))) - (setq begin1 next))) + (cond + ((get-text-property begin 'jupyter-ansi) + (setq begin1 begin + end1 next + begin next) + (while (/= begin1 end1) + (setq next (next-single-property-change + begin1 'font-lock-face nil end1)) + (when (get-text-property begin1 'font-lock-face) + (font-lock-prepend-text-property + begin1 next 'face (get-text-property begin1 'font-lock-face))) + (setq begin1 next))) + (t (put-text-property begin next 'jupyter-ansi t) (jupyter-ansi-color-apply-on-region begin next) - (setq begin next))))) + (setq begin next)))))) ;; Adapted from `org-fontify-meta-lines-and-blocks-1' (defun jupyter-org-font-lock-ansi-escapes (limit)