diff --git a/julia/TeXmacsJulia.jl b/julia/TeXmacsJulia.jl index 5e0b842..3143fd5 100644 --- a/julia/TeXmacsJulia.jl +++ b/julia/TeXmacsJulia.jl @@ -33,7 +33,7 @@ import REPL.REPLCompletions: completions, completion_text using REPL import UUIDs import Markdown -import Base: AbstractDisplay, display, redisplay, catch_stack, show +import Base: AbstractDisplay, display, redisplay, show const current_module = Ref{Module}(Main) const orig_stdout = Ref{IO}(stdout) @@ -186,6 +186,9 @@ display(d::InlineDisplay, m::MIME"image/png", x) = display(d::InlineDisplay, m::MIME"image/jpeg", x) = sendimage("jpg", m, x) +display(d::InlineDisplay, m::MIME"image/svg+xml", x) = + sendimage("svg", m, x) + display(d::InlineDisplay, m::MIME"application/pdf", x) = sendimage("pdf", m, x) @@ -211,10 +214,10 @@ display(d::InlineDisplay, x::Markdown.MD) = display(d, MIME("text/markdown"), x) # we try to display data according to these mime types # in order const tm_mimetypes = [ - MIME("image/svg"), + MIME("image/svg+xml"), MIME("application/pdf"), MIME("image/png"), - MIME("image/jpg"), + MIME("image/jpeg"), MIME("text/html"), MIME("text/markdown"), MIME("text/latex")] @@ -341,7 +344,7 @@ while true end catch e err = e - result = catch_stack() + result = current_exceptions() end # output @@ -354,7 +357,7 @@ while true end catch e write(stdout, "Error showing values $(e)"); - Base.invokelatest(Base.display_error, stderr, catch_stack()) + Base.invokelatest(Base.display_error, stderr, current_exceptions()) end flush_all() # send all to texmacs # flush_output() # send all to texmacs diff --git a/progs/init-julia.scm b/progs/init-julia.scm index 46742a3..0aa0460 100644 --- a/progs/init-julia.scm +++ b/progs/init-julia.scm @@ -24,9 +24,7 @@ (define (julia-launcher) (with boot (raw-quote (julia-entry)) - (if (url-exists-in-path? "julia") - (string-append "julia " boot) - (string-append "julia " boot)))) + (string-append "julia " boot))) (plugin-configure julia (:winpath "Julia" "bin")