org: support org >= 8.3
* doc/org/.dir-locals.el.in, doc/org/init.el.in: Load "shell" instead of "sh" for recent org-mode version.
This commit is contained in:
parent
2f02911e1a
commit
8e8c6a8cea
2 changed files with 4 additions and 2 deletions
|
|
@ -5,6 +5,7 @@
|
|||
(org-mode . ((whitespace-style face empty trailing)
|
||||
(eval .
|
||||
(progn
|
||||
(require 'org-version)
|
||||
(setenv "PATH"
|
||||
(concat "@abs_top_builddir@/bin"
|
||||
path-separator
|
||||
|
|
@ -24,7 +25,7 @@
|
|||
(setenv "SPOT_DOTDEFAULT" "Brf(Lato)C(#ffffa0)")
|
||||
(setenv "SPOT_DOTEXTRA" "edge[arrowhead=vee, arrowsize=.7]")
|
||||
(org-babel-do-load-languages 'org-babel-load-languages
|
||||
'((sh . t)
|
||||
`((,(if (version< org-version "8.3") 'sh 'shell) . t)
|
||||
(python . t)
|
||||
(plantuml . t)
|
||||
(dot . t)
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
(or (require 'org-publish nil t) ; Org 7
|
||||
(require 'ox-publish)) ; Org 8
|
||||
(require 'org-install)
|
||||
(require 'org-version)
|
||||
(require 'hoa-mode)
|
||||
|
||||
(print (concat "Org " (org-version)))
|
||||
|
|
@ -20,7 +21,7 @@
|
|||
|
||||
(org-babel-do-load-languages
|
||||
'org-babel-load-languages
|
||||
'((sh . t)
|
||||
`((,(if (version< org-version "8.3") 'sh 'shell) . t)
|
||||
(dot . t)
|
||||
(python . t)
|
||||
(plantuml . t)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue