ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Kyle Meyer 2018-03-26 00:07:03 -04:00
parent 18082bcdc9 8cf787cbad
commit be8f76cbe9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/org.texi
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 Org comes with a fast and intuitive table editor. Spreadsheet-like
calculations are supported using the Emacs @file{calc} package 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 @menu
* Built-in table editor:: Simple tables * Built-in table editor:: Simple tables

2
lisp/ob-lisp.el
View File

@ -54,7 +54,7 @@ Valid values include `slime-eval' and `sly-eval'."
:group 'org-babel :group 'org-babel
:version "26.1" :version "26.1"
:package-version '(Org . "9.0") :package-version '(Org . "9.0")
:type 'function) :type 'symbol)
(defcustom org-babel-lisp-dir-fmt (defcustom org-babel-lisp-dir-fmt
"(let ((*default-pathname-defaults* #P%S\n)) %%s\n)" "(let ((*default-pathname-defaults* #P%S\n)) %%s\n)"