From 8e8c6a8ceadc1e82d0afc885460b1a0a4158ab71 Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@lrde.epita.fr>
Date: Fri, 23 Dec 2016 15:26:34 +0100
Subject: [PATCH] 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.
---
 doc/org/.dir-locals.el.in | 3 ++-
 doc/org/init.el.in        | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/org/.dir-locals.el.in b/doc/org/.dir-locals.el.in
index e5f3385d4..810ef0ec4 100644
--- a/doc/org/.dir-locals.el.in
+++ b/doc/org/.dir-locals.el.in
@@ -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)
diff --git a/doc/org/init.el.in b/doc/org/init.el.in
index 11457eff0..6828c18de 100644
--- a/doc/org/init.el.in
+++ b/doc/org/init.el.in
@@ -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)