tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

ob-shell: Add missing "sh" to "shell" conversions 

* lisp/ob-shell.el (org-babel-default-header-args:shell): Renamed from
`org-babel-default-header-args:sh'.
(org-babel-variable-assignments:shell): Renamed from
`org-babel-variable-assignments:sh'.
(org-babel-prep-session:shell): Renamed from
`org-babel-prep-session:sh'.  Apply renaming.
(org-babel-load-session:shell): Renamed from
`org-babel-load-session:sh'.  Apply renaming.

(org-babel-execute:shell): Apply renaming.

Reported-by: Sebastien Vauban
<http://permalink.gmane.org/gmane.emacs.orgmode/98859>
This commit is contained in:
Nicolas Goaziou 2015-07-03 16:14:25 +02:00
parent 188bae903f
commit 048f0e1a82
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lisp/ob-shell.el
View File

@ -36,7 +36,7 @@
(declare-function org-babel-comint-with-output "ob-comint" (meta &rest body)) (declare-function org-babel-comint-with-output "ob-comint" (meta &rest body))
(declare-function orgtbl-to-generic "org-table" (table params)) (declare-function orgtbl-to-generic "org-table" (table params))
(defvar org-babel-default-header-args:sh '()) (defvar org-babel-default-header-args:shell '())
(defcustom org-babel-shell-names (defcustom org-babel-shell-names
'("sh" "bash" "csh" "ash" "dash" "ksh" "mksh" "posh") '("sh" "bash" "csh" "ash" "dash" "ksh" "mksh" "posh")
@ -64,7 +64,7 @@ This function is called by `org-babel-execute-src-block'."
(org-babel-ref-resolve stdin))))) (org-babel-ref-resolve stdin)))))
(cmdline (cdr (assoc :cmdline params))) (cmdline (cdr (assoc :cmdline params)))
(full-body (org-babel-expand-body:generic (full-body (org-babel-expand-body:generic
body params (org-babel-variable-assignments:sh params)))) body params (org-babel-variable-assignments:shell params))))
(org-babel-reassemble-table (org-babel-reassemble-table
(org-babel-sh-evaluate session full-body params stdin cmdline) (org-babel-sh-evaluate session full-body params stdin cmdline)
(org-babel-pick-name (org-babel-pick-name
@ -72,20 +72,20 @@ This function is called by `org-babel-execute-src-block'."
(org-babel-pick-name (org-babel-pick-name
(cdr (assoc :rowname-names params)) (cdr (assoc :rownames params)))))) (cdr (assoc :rowname-names params)) (cdr (assoc :rownames params))))))
(defun org-babel-prep-session:sh (session params) (defun org-babel-prep-session:shell (session params)
"Prepare SESSION according to the header arguments specified in PARAMS." "Prepare SESSION according to the header arguments specified in PARAMS."
(let* ((session (org-babel-sh-initiate-session session)) (let* ((session (org-babel-sh-initiate-session session))
(var-lines (org-babel-variable-assignments:sh params))) (var-lines (org-babel-variable-assignments:shell params)))
(org-babel-comint-in-buffer session (org-babel-comint-in-buffer session
(mapc (lambda (var) (mapc (lambda (var)
(insert var) (comint-send-input nil t) (insert var) (comint-send-input nil t)
(org-babel-comint-wait-for-output session)) var-lines)) (org-babel-comint-wait-for-output session)) var-lines))
session)) session))
(defun org-babel-load-session:sh (session body params) (defun org-babel-load-session:shell (session body params)
"Load BODY into SESSION." "Load BODY into SESSION."
(save-window-excursion (save-window-excursion
(let ((buffer (org-babel-prep-session:sh session params))) (let ((buffer (org-babel-prep-session:shell session params)))
(with-current-buffer buffer (with-current-buffer buffer
(goto-char (process-mark (get-buffer-process (current-buffer)))) (goto-char (process-mark (get-buffer-process (current-buffer))))
(insert (org-babel-chomp body))) (insert (org-babel-chomp body)))
@ -129,7 +129,7 @@ This function is called by `org-babel-execute-src-block'."
(org-babel-variable-assignments:bash_assoc varname values sep hline)) (org-babel-variable-assignments:bash_assoc varname values sep hline))
(org-babel-variable-assignments:sh-generic varname values sep hline))) (org-babel-variable-assignments:sh-generic varname values sep hline)))
(defun org-babel-variable-assignments:sh (params) (defun org-babel-variable-assignments:shell (params)
"Return list of shell statements assigning the block's variables." "Return list of shell statements assigning the block's variables."
(let ((sep (cdr (assoc :separator params))) (let ((sep (cdr (assoc :separator params)))
(hline (when (string= "yes" (cdr (assoc :hlines params))) (hline (when (string= "yes" (cdr (assoc :hlines params)))