From b45c1ff4d439576e5893bfffb08d88e4734c4291 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Thu, 22 Mar 2018 14:37:45 -0400
Subject: [PATCH 1/2] Backport commit a6a821d29 from Emacs

* lisp/ob-lisp.el (org-babel-lisp-eval-fn): Tweak type.

Avoids type mismatch when relevant library is not present/loaded.

a6a821d29bda3e45fb26289e6119359ea3b91ebb
Glenn Morris
Thu Mar 22 14:37:45 2018 -0400
---
 lisp/ob-lisp.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/ob-lisp.el b/lisp/ob-lisp.el
index 223407e7b..b846138f7 100644
--- a/lisp/ob-lisp.el
+++ b/lisp/ob-lisp.el
@@ -54,7 +54,7 @@ Valid values include `slime-eval' and `sly-eval'."
   :group 'org-babel
   :version "26.1"
   :package-version '(Org . "9.0")
-  :type 'function)
+  :type 'symbol)
 
 (defcustom org-babel-lisp-dir-fmt
   "(let ((*default-pathname-defaults* #P%S\n)) %%s\n)"

From 8cf787cbad5db927f37fb00ec1d1833395cc4d84 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Fri, 23 Mar 2018 16:01:12 -0400
Subject: [PATCH 2/2] Backport commit 7d6c7d0b4 from Emacs

; Use GNU not Gnu in docs
7d6c7d0b461705fd67f7df1096b6f6376931f140
Glenn Morris
Fri Mar 23 16:01:12 2018 -0400
---
 doc/org.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/org.texi b/doc/org.texi
index a1b083edd..7fba2a11b 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -2059,7 +2059,7 @@ You can check syntax in your documents using @code{org-lint} command.
 
 Org comes with a fast and intuitive table editor.  Spreadsheet-like
 calculations are supported using the Emacs @file{calc} package
-(@pxref{Top, Calc, , calc, Gnu Emacs Calculator Manual}).
+(@pxref{Top, Calc, , calc, GNU Emacs Calculator Manual}).
 
 @menu
 * Built-in table editor::       Simple tables