emacs
/
plantuml-mode
mirror of https://github.com/skuro/plantuml-mode.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed plantuml invocation

This commit is contained in:
Carlo Sciolla 2016-10-18 19:25:15 +02:00
parent 0011cae6a4
commit 2b7d796886
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plantuml-mode.el
View File

@ -81,13 +81,13 @@
(defun plantuml-command-line () (defun plantuml-command-line ()
"Compose the PlantUML command line as a string." "Compose the PlantUML command line as a string."
(apply 'concat plantuml-java-command (mapconcat 'identity (cons plantuml-java-command plantuml-java-args) " "))
(mapconcat 'identity (cons plantuml-java-command plantuml-java-args) " ")))
(defun plantuml-render-command (&rest arguments) (defun plantuml-render-command (&rest arguments)
"Create a command line to execute PlantUML with arguments (as ARGUMENTS)." "Create a command line to execute PlantUML with arguments (as ARGUMENTS)."
(let ((cmd (concat (plantuml-command-line) " " (shell-quote-argument plantuml-jar-path))) (let ((cmd (concat (plantuml-command-line) " " (shell-quote-argument plantuml-jar-path)))
(argstring (mapconcat 'identity arguments " "))) (argstring (mapconcat 'identity arguments " ")))
(plantuml-debug (format "Command is %s" cmd))
(concat cmd " " argstring))) (concat cmd " " argstring)))
;;; syntax table ;;; syntax table
@ -138,7 +138,6 @@
(error "Could not find plantuml.jar at %s" plantuml-jar-path)) (error "Could not find plantuml.jar at %s" plantuml-jar-path))
(with-temp-buffer (with-temp-buffer
(let ((cmd (plantuml-render-command "-charset UTF-8 -language"))) (let ((cmd (plantuml-render-command "-charset UTF-8 -language")))
(plantuml-debug (concat "Command is: " cmd))
(shell-command cmd (current-buffer)) (shell-command cmd (current-buffer))
(goto-char (point-min))) (goto-char (point-min)))
(let ((found (search-forward ";" nil t)) (let ((found (search-forward ";" nil t))