Merge branch 'issue106' into develop

This commit is contained in:
Carlo Sciolla 2019-08-21 14:31:52 +02:00
commit 36e0abac58
No known key found for this signature in database
GPG Key ID: BA5D71E6F3C580C1
1 changed files with 8 additions and 8 deletions

View File

@ -178,12 +178,12 @@
(interactive (let* ((completion-ignore-case t) (interactive (let* ((completion-ignore-case t)
(supported-modes '("jar" "server" "executable"))) (supported-modes '("jar" "server" "executable")))
(list (completing-read (format "Exec mode [%s]: " plantuml-exec-mode) (list (completing-read (format "Exec mode [%s]: " plantuml-exec-mode)
supported-modes supported-modes
nil nil
t t
nil nil
nil nil
plantuml-exec-mode)))) plantuml-exec-mode))))
(if (member mode '("jar" "server" "executable")) (if (member mode '("jar" "server" "executable"))
(setq plantuml-exec-mode (intern mode)) (setq plantuml-exec-mode (intern mode))
(error (concat "Unsupported mode:" mode)))) (error (concat "Unsupported mode:" mode))))
@ -230,9 +230,9 @@
(strs (xml-get-children doc 'str)) (strs (xml-get-children doc 'str))
(version (->> strs (version (->> strs
(--filter (string-equal "v" (xml-get-attribute it 'name))) (--filter (string-equal "v" (xml-get-attribute it 'name)))
(first) (car)
(xml-node-children) (xml-node-children)
(first)))) (car))))
(message (concat "Downloading PlantUML v" version " into " plantuml-jar-path)) (message (concat "Downloading PlantUML v" version " into " plantuml-jar-path))
(url-copy-file (format "https://search.maven.org/remotecontent?filepath=net/sourceforge/plantuml/plantuml/%s/plantuml-%s.jar" version version) plantuml-jar-path t) (url-copy-file (format "https://search.maven.org/remotecontent?filepath=net/sourceforge/plantuml/plantuml/%s/plantuml-%s.jar" version version) plantuml-jar-path t)
(kill-buffer))) (kill-buffer)))