hiro/emacs-jupyter
1
0
Fork 0
mirror of https://github.com/vale981/emacs-jupyter synced 2025-03-04 23:41:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

jupyter-org--ansi-color-apply-on-region: Use cond

Browse source
This commit is contained in:
Nathaniel Nicandro 2019-06-10 12:56:21 -05:00
parent d6393d8e51
commit 195576bdbf
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
jupyter-org-client.el
View file

@ -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)