summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2015-07-03 14:14:25 (GMT)
committer Nicolas Goaziou <mail@nicolasgoaziou.fr>2015-07-03 14:17:11 (GMT)
commit048f0e1a82cbb9fa29aa5ad8c778b1a72fc59fda (patch)
tree29d44ce3749874dfb397c16c5d59b1ca1574f6f1
parent188bae903feb942355dae6878951e9f13211e1d0 (diff)
downloadorg-mode-master.zip
org-mode-master.tar.gz
ob-shell: Add missing "sh" to "shell" conversionsHEADmaster
* 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>
-rw-r--r--lisp/ob-shell.el14
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/ob-shell.el b/lisp/ob-shell.el
index 5b74821..3ee2f4d 100644
--- a/lisp/ob-shell.el
+++ b/lisp/ob-shell.el
@@ -36,7 +36,7 @@
(declare-function org-babel-comint-with-output "ob-comint" (meta &rest body))
(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
'("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)))))
(cmdline (cdr (assoc :cmdline params)))
(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-sh-evaluate session full-body params stdin cmdline)
(org-babel-pick-name
@@ -72,20 +72,20 @@ This function is called by `org-babel-execute-src-block'."
(org-babel-pick-name
(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."
(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
(mapc (lambda (var)
(insert var) (comint-send-input nil t)
(org-babel-comint-wait-for-output session)) var-lines))
session))
-(defun org-babel-load-session:sh (session body params)
+(defun org-babel-load-session:shell (session body params)
"Load BODY into SESSION."
(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
(goto-char (process-mark (get-buffer-process (current-buffer))))
(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: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."
(let ((sep (cdr (assoc :separator params)))
(hline (when (string= "yes" (cdr (assoc :hlines params)))