summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2018-03-26 00:07:03 -0400
committerKyle Meyer <kyle@kyleam.com>2018-03-26 00:07:03 -0400
commitbe8f76cbe983adfdb1b35ca8a824b32926dc78ed (patch)
tree8bfaa9ebb1e593d58aad17bacb58992e65fa9a1f
parent18082bcdc9dfec47ab621610614af4a90eb52133 (diff)
parent8cf787cbad5db927f37fb00ec1d1833395cc4d84 (diff)
downloadorg-mode-be8f76cbe983adfdb1b35ca8a824b32926dc78ed.tar.gz
Merge branch 'maint'
-rw-r--r--doc/org.texi2
-rw-r--r--lisp/ob-lisp.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/org.texi b/doc/org.texi
index d268757..aaa1804 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -2021,7 +2021,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
diff --git a/lisp/ob-lisp.el b/lisp/ob-lisp.el
index 223407e..b846138 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)"