branch: externals-release/org
commit efa498b679653eb68f3a32e18020541ad4d17b04
Author: Bastien <b...@gnu.org>
Commit: Bastien <b...@gnu.org>
lisp/ob-julia.el: Backport modifications from Emacs b5e3cc3
* (org-babel-julia-initiate-session): Use `bound-and-true-p`.
---
lisp/ob-julia.el | 43 ++++++++++++++++++++-----------------------
1 file changed, 20 insertions(+), 23 deletions(-)
diff --git a/lisp/ob-julia.el b/lisp/ob-julia.el
index ad90f06..b44db4c 100644
--- a/lisp/ob-julia.el
+++ b/lisp/ob-julia.el
@@ -44,7 +44,7 @@
(raw org html latex code pp wrap)
(replace silent append prepend)
(output value graphics))))
- "julia-specific header arguments.")
+ "Julia-specific header arguments.")
(add-to-list 'org-babel-tangle-lang-exts '("julia" . "jl"))
@@ -58,8 +58,8 @@
:type 'string)
(defvar ess-current-process-name) ; dynamically scoped
-(defvar ess-local-process-name) ; dynamically scoped
-(defvar ess-eval-visibly-p) ; dynamically scoped
+(defvar ess-local-process-name) ; dynamically scoped
+(defvar ess-eval-visibly-p) ; dynamically scoped
(defun org-babel-edit-prep:julia (info)
(let ((session (cdr (assq :session (nth 2 info)))))
(when (and session
@@ -69,7 +69,7 @@
(defun org-babel-expand-body:julia (body params &optional _graphics-file)
"Expand BODY according to PARAMS, return the expanded body."
- (mapconcat 'identity
+ (mapconcat #'identity
(append
(when (cdr (assq :prologue params))
(list (cdr (assq :prologue params))))
@@ -143,15 +143,15 @@ This function is called by `org-babel-execute-src-block'."
(defun org-babel-julia-quote-csv-field (s)
"Quote field S for export to julia."
(if (stringp s)
- (concat "\"" (mapconcat 'identity (split-string s "\"") "\"\"") "\"")
+ (concat "\"" (mapconcat #'identity (split-string s "\"") "\"\"") "\"")
(format "%S" s)))
(defun org-babel-julia-assign-elisp (name value)
"Construct julia code assigning the elisp VALUE to a variable named NAME."
(if (listp value)
- (let* ((lengths (mapcar 'length (cl-remove-if-not 'sequencep value)))
- (max (if lengths (apply 'max lengths) 0))
- (min (if lengths (apply 'min lengths) 0)))
+ (let* ((lengths (mapcar #'length (cl-remove-if-not 'sequencep value)))
+ (max (if lengths (apply #'max lengths) 0))
+ (min (if lengths (apply #'min lengths) 0)))
;; Ensure VALUE has an orgtbl structure (depth of at least 2).
(unless (listp (car value)) (setq value (list value)))
(let ((file (orgtbl-to-csv value '(:fmt
org-babel-julia-quote-csv-field))))
@@ -173,11 +173,15 @@ end"
(unless (string= session "none")
(let ((session (or session "*Julia*"))
(ess-ask-for-ess-directory
- (and (boundp 'ess-ask-for-ess-directory)
- ess-ask-for-ess-directory
- (not (cdr (assq :dir params))))))
+ (and (bound-and-true-p ess-ask-for-ess-directory)
+ (not (cdr (assq :dir params))))))
(if (org-babel-comint-buffer-livep session)
session
+ ;; FIXME: Depending on `display-buffer-alist', (julia) may end up
+ ;; popping up a new frame which `save-window-excursion' won't be able
+ ;; to "undo", so we really should call a kind of
+ ;; `julia-no-select' instead so we don't need to undo any
+ ;; window-changes afterwards.
(save-window-excursion
(when (get-buffer session)
;; Session buffer exists, but with dead process
@@ -191,14 +195,6 @@ end"
(buffer-name))))
(current-buffer))))))
- ; (defun
org-babel-julia-associate-session (session)
- ; "Associate julia code buffer with
a julia session.
- ; Make SESSION be the inferior ESS
process associated with the
- ; current code buffer."
- ; (setq ess-local-process-name
- ; (process-name
(get-buffer-process session)))
- ; (ess-make-buffer-current))
-
(defun org-babel-julia-graphical-output-file (params)
"Name of file to which julia should send graphical output."
(and (member "graphics" (cdr (assq :result-params params)))
@@ -304,7 +300,7 @@ last statement in BODY, as elisp."
column-names-p)))
(output
(mapconcat
- 'org-babel-chomp
+ #'org-babel-chomp
(butlast
(delq nil
(mapcar
@@ -317,13 +313,14 @@ last statement in BODY, as elisp."
(substring line (match-end 1))
line))
(org-babel-comint-with-output (session
org-babel-julia-eoe-output)
- (insert (mapconcat 'org-babel-chomp
+ (insert (mapconcat #'org-babel-chomp
(list body org-babel-julia-eoe-indicator)
"\n"))
- (inferior-ess-send-input)))))) "\n"))))
+ (inferior-ess-send-input))))))
+ "\n"))))
(defun org-babel-julia-process-value-result (result column-names-p)
- "julia-specific processing of return value.
+ "Julia-specific processing of return value.
Insert hline if column names in output have been requested."
(if column-names-p
(cons (car result) (cons 'hline (cdr result)))
