diff options
| author | Bastien Guerry <bzg@gnu.org> | 2012-09-30 17:14:59 +0200 |
|---|---|---|
| committer | Bastien Guerry <bzg@gnu.org> | 2012-09-30 17:14:59 +0200 |
| commit | 8223b1d23361b74ede10bac47974ce7803804380 (patch) | |
| tree | 3a2491c5193fed1bef14acd45092c0b9736fa5d6 /lisp/org/ob-octave.el | |
| parent | 163227893c97b5b41039ea9d5ceadb7e5b2d570c (diff) | |
| download | emacs-8223b1d23361b74ede10bac47974ce7803804380.tar.gz emacs-8223b1d23361b74ede10bac47974ce7803804380.tar.bz2 emacs-8223b1d23361b74ede10bac47974ce7803804380.zip | |
Sync Org 7.9.2 from the commit tagged "release_7.9.2" in Org's Git repo.
Diffstat (limited to 'lisp/org/ob-octave.el')
| -rw-r--r-- | lisp/org/ob-octave.el | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/org/ob-octave.el b/lisp/org/ob-octave.el index 9e8575768dc..73f25eca155 100644 --- a/lisp/org/ob-octave.el +++ b/lisp/org/ob-octave.el @@ -52,7 +52,7 @@ to a non-nil value.") (defvar org-babel-matlab-emacs-link-wrapper-method - "%s + "%s if ischar(ans), fid = fopen('%s', 'w'); fprintf(fid, '%%s\\n', ans); fclose(fid); else, save -ascii %s ans end @@ -110,7 +110,7 @@ end") (org-babel-prep-session:octave session params 'matlab)) (defun org-babel-variable-assignments:octave (params) - "Return list of octave statements assigning the block's variables" + "Return list of octave statements assigning the block's variables." (mapcar (lambda (pair) (format "%s=%s;" @@ -147,13 +147,13 @@ specifying a variable of the same value." (defun org-babel-matlab-initiate-session (&optional session params) "Create a matlab inferior process buffer. If there is not a current inferior-process-buffer in SESSION then -create. Return the initialized session." +create. Return the initialized session." (org-babel-octave-initiate-session session params 'matlab)) (defun org-babel-octave-initiate-session (&optional session params matlabp) "Create an octave inferior process buffer. If there is not a current inferior-process-buffer in SESSION then -create. Return the initialized session." +create. Return the initialized session." (if matlabp (require 'matlab) (require 'octave-inf)) (unless (string= session "none") (let ((session (or session @@ -225,9 +225,9 @@ value of the last statement in BODY, as elisp." (message "Waiting for Matlab Emacs Link") (while (file-exists-p wait-file) (sit-for 0.01)) "")) ;; matlab-shell-run-region doesn't seem to - ;; make *matlab* buffer contents easily - ;; available, so :results output currently - ;; won't work + ;; make *matlab* buffer contents easily + ;; available, so :results output currently + ;; won't work (org-babel-comint-with-output (session (if matlabp @@ -265,7 +265,7 @@ This removes initial blank and comment lines and then calls (org-babel-import-elisp-from-file temp-file '(16)))) (defun org-babel-octave-read-string (string) - "Strip \\\"s from around octave string" + "Strip \\\"s from around octave string." (if (string-match "^\"\\([^\000]+\\)\"$" string) (match-string 1 string) string)) |