diff options
Diffstat (limited to 'lisp/ob-forth.el')
| -rw-r--r-- | lisp/ob-forth.el | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lisp/ob-forth.el b/lisp/ob-forth.el index 5a46d36..e487931 100644 --- a/lisp/ob-forth.el +++ b/lisp/ob-forth.el @@ -1,4 +1,4 @@ -;;; ob-forth.el --- org-babel functions for Forth +;;; ob-forth.el --- Babel Functions for Forth -*- lexical-binding: t; -*- ;; Copyright (C) 2014-2016 Free Software Foundation, Inc. @@ -35,6 +35,7 @@ (require 'ob) (declare-function forth-proc "ext:gforth" ()) +(declare-function org-trim "org" (s &optional keep-lead)) (defvar org-babel-default-header-args:forth '((:session . "yes")) "Default header arguments for forth code blocks.") @@ -42,10 +43,10 @@ (defun org-babel-execute:forth (body params) "Execute a block of Forth code with org-babel. This function is called by `org-babel-execute-src-block'" - (if (string= "none" (cdr (assoc :session params))) + (if (string= "none" (cdr (assq :session params))) (error "Non-session evaluation not supported for Forth code blocks") (let ((all-results (org-babel-forth-session-execute body params))) - (if (member "output" (cdr (assoc :result-params params))) + (if (member "output" (cdr (assq :result-params params))) (mapconcat #'identity all-results "\n") (car (last all-results)))))) @@ -76,10 +77,10 @@ This function is called by `org-babel-execute-src-block'" (org-babel-eval-error-notify 1 (buffer-substring (+ (match-beginning 0) 1) (point-max))) nil)))) - (split-string (org-babel-trim - (org-babel-expand-body:generic - body params)) - "\n" 'omit-nulls))))) + (split-string (org-trim + (org-babel-expand-body:generic body params)) + "\n" + 'omit-nulls))))) (provide 'ob-forth) |