Merge branch 'maint'

This commit is contained in:
Kyle Meyer 2018-03-26 00:07:03 -04:00
commit be8f76cbe9
2 changed files with 2 additions and 2 deletions

View File

@ -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

View File

@ -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)"