diff options
| author | Eli Zaretskii | 2017-09-29 13:24:05 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2017-09-29 13:24:05 +0300 |
| commit | 33401b26b1aecf61adfd77fa7c4e29913c0bb3d7 (patch) | |
| tree | 0238b3a9e51c4a37f8fe35feb11a66baeb2d1f3d /lisp/org/ob-lua.el | |
| parent | c1ac8c170f17a98b7e5d6e098f707daeb71ea27d (diff) | |
| parent | d4b2bbdc73ace5cb0971a32a75941486489d1cc5 (diff) | |
| download | emacs-33401b26b1aecf61adfd77fa7c4e29913c0bb3d7.tar.gz emacs-33401b26b1aecf61adfd77fa7c4e29913c0bb3d7.zip | |
Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26
Diffstat (limited to 'lisp/org/ob-lua.el')
| -rw-r--r-- | lisp/org/ob-lua.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/org/ob-lua.el b/lisp/org/ob-lua.el index 4fd7a323825..fc9d9f2f0e2 100644 --- a/lisp/org/ob-lua.el +++ b/lisp/org/ob-lua.el | |||
| @@ -49,7 +49,7 @@ | |||
| 49 | 49 | ||
| 50 | (defcustom org-babel-lua-command "lua" | 50 | (defcustom org-babel-lua-command "lua" |
| 51 | "Name of the command for executing Lua code." | 51 | "Name of the command for executing Lua code." |
| 52 | :version "24.5" | 52 | :version "26.1" |
| 53 | :package-version '(Org . "8.3") | 53 | :package-version '(Org . "8.3") |
| 54 | :group 'org-babel | 54 | :group 'org-babel |
| 55 | :type 'string) | 55 | :type 'string) |
| @@ -58,21 +58,21 @@ | |||
| 58 | "Preferred lua mode for use in running lua interactively. | 58 | "Preferred lua mode for use in running lua interactively. |
| 59 | This will typically be 'lua-mode." | 59 | This will typically be 'lua-mode." |
| 60 | :group 'org-babel | 60 | :group 'org-babel |
| 61 | :version "24.5" | 61 | :version "26.1" |
| 62 | :package-version '(Org . "8.3") | 62 | :package-version '(Org . "8.3") |
| 63 | :type 'symbol) | 63 | :type 'symbol) |
| 64 | 64 | ||
| 65 | (defcustom org-babel-lua-hline-to "None" | 65 | (defcustom org-babel-lua-hline-to "None" |
| 66 | "Replace hlines in incoming tables with this when translating to lua." | 66 | "Replace hlines in incoming tables with this when translating to lua." |
| 67 | :group 'org-babel | 67 | :group 'org-babel |
| 68 | :version "24.5" | 68 | :version "26.1" |
| 69 | :package-version '(Org . "8.3") | 69 | :package-version '(Org . "8.3") |
| 70 | :type 'string) | 70 | :type 'string) |
| 71 | 71 | ||
| 72 | (defcustom org-babel-lua-None-to 'hline | 72 | (defcustom org-babel-lua-None-to 'hline |
| 73 | "Replace 'None' in lua tables with this before returning." | 73 | "Replace 'None' in lua tables with this before returning." |
| 74 | :group 'org-babel | 74 | :group 'org-babel |
| 75 | :version "24.5" | 75 | :version "26.1" |
| 76 | :package-version '(Org . "8.3") | 76 | :package-version '(Org . "8.3") |
| 77 | :type 'symbol) | 77 | :type 'symbol) |
| 78 | 78 | ||