Merge branch 'master' of github.com:IvanMalison/dotfiles

This commit is contained in:
2016-10-17 17:51:31 -07:00
3 changed files with 30 additions and 31 deletions

View File

@@ -2678,7 +2678,7 @@ Intero seems to be causing hangs, so it has been disabled
(sp-local-pair 'org-mode "~" "~")
(add-to-list
'org-src-lang-modes '("plantuml" . puml))
'org-src-lang-modes '("plantuml" . plantuml))
(org-babel-do-load-languages
'org-babel-load-languages
@@ -3096,11 +3096,11 @@ Intero seems to be causing hangs, so it has been disabled
(progn
(add-hook 'markdown-mode-hook 'imalison:disable-linum-mode)))
#+END_SRC
*** puml-mode (plantuml-support)
*** plantuml-mode
This mode seems to be better maintained than plantuml-mode
#+BEGIN_SRC emacs-lisp
(use-package puml-mode
:commands puml-mode
(use-package plantuml-mode
:commands plantuml-mode
:mode ("\\.puml\\'" "\\.plantuml\\'")
:preface
(progn
@@ -3112,14 +3112,14 @@ This mode seems to be better maintained than plantuml-mode
(--first (s-ends-with? ".jar" it) (directory-files plantuml-dir))))
(filepath (when filename
(imalison:join-paths plantuml-dir filename))))
(setq puml-plantuml-jar-path filepath
(setq plantuml-jar-path filepath
org-plantuml-jar-path filepath)))
((equal system-type 'gnu/linux)
(let ((filepath "/opt/plantuml/plantuml.jar"))
(setq puml-plantuml-jar-path filepath
(setq plantuml-jar-path filepath
org-plantuml-jar-path filepath))))
(add-to-list
'org-src-lang-modes '("plantuml" . puml))))
'org-src-lang-modes '("plantuml" . plantuml))))
#+END_SRC
*** wsd-mode
#+BEGIN_SRC emacs-lisp

View File

@@ -114,13 +114,11 @@ function _tex_setup {
}
function _racket_setup {
if command_exists; then
if is_osx; then
local racket_base_path="$(brew --prefix racket)"
# XXX: Seems maybe this is not needed
# local newest_version_number="$(ls \"$racket_base_path\" | sort -Vr | head -n1)"
add_to_path "$racket_base_path/bin" --before
fi
if is_osx; then
local racket_base_path="$(brew --prefix racket)"
# XXX: Seems maybe this is not needed
# local newest_version_number="$(ls \"$racket_base_path\" | sort -Vr | head -n1)"
add_to_path "$racket_base_path/bin" --before
fi
}