|
@@ -65,11 +65,11 @@ PARAMS are given by org-babel.
|
|
|
This function is called by `org-babel-execute-src-block'"
|
|
|
(message "executing J source code block")
|
|
|
(let* ((processed-params (org-babel-process-params params))
|
|
|
- (sessionp (cdr (assoc :session params)))
|
|
|
+ (sessionp (nth 1 (assoc :session params)))
|
|
|
(session (org-babel-j-initiate-session sessionp))
|
|
|
- (vars (second processed-params))
|
|
|
- (result-params (third processed-params))
|
|
|
- (result-type (fourth processed-params))
|
|
|
+ (vars (nth 2 processed-params))
|
|
|
+ (result-params (nth 3 processed-params))
|
|
|
+ (result-type (nth 4 processed-params))
|
|
|
(full-body (org-babel-expand-body:J
|
|
|
body params processed-params))
|
|
|
(tmp-script-file (org-babel-temp-file "J-src")))
|
|
@@ -141,10 +141,10 @@ Don't trust first line."
|
|
|
(a (obj-get-string-alignment x))
|
|
|
(lines (split-string x "\n" t))
|
|
|
b)
|
|
|
- (cond ((minusp a)
|
|
|
+ (cond ((< a 0)
|
|
|
(setq b (obj-match-second-space-right (nth 0 lines)))
|
|
|
(concat (make-string (+ a b) ? ) x))
|
|
|
- ((plusp a)
|
|
|
+ ((> a 0)
|
|
|
(setq b (obj-match-second-space-left (nth 0 lines)))
|
|
|
(concat (make-string (- a b) ? ) x))
|
|
|
(t x))))
|