summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-01-12 11:02:57 (GMT)
committer Bastien Guerry <bzg@altern.org>2014-01-12 11:02:57 (GMT)
commite9e182a7f5d3d91a74c2d5e0b6dd78048d364788 (patch)
treece7f46d4b4201f889bec95c1348b6c79cd3cf366
parent90884b9748f87acc9ad2ac8810e9b5472387ff72 (diff)
parenta0610f0775a0a38b4815060371f320942213e19a (diff)
downloadorg-mode-e9e182a7f5d3d91a74c2d5e0b6dd78048d364788.zip
org-mode-e9e182a7f5d3d91a74c2d5e0b6dd78048d364788.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ob-table.el12
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/ob-table.el b/lisp/ob-table.el
index f7c5526..831e352 100644
--- a/lisp/ob-table.el
+++ b/lisp/ob-table.el
@@ -24,7 +24,7 @@
;;; Commentary:
;; Should allow calling functions from org-mode tables using the
-;; function `sbe' as so...
+;; function `org-sbe' as so...
;; #+begin_src emacs-lisp :results silent
;; (defun fibbd (n) (if (< n 2) 1 (+ (fibbd (- n 1)) (fibbd (- n 2)))))
@@ -47,7 +47,7 @@
;; | 7 | |
;; | 8 | |
;; | 9 | |
-;; #+TBLFM: $2='(sbe 'fibbd (n $1))
+;; #+TBLFM: $2='(org-sbe 'fibbd (n $1))
;;; Code:
(require 'ob-core)
@@ -60,14 +60,14 @@ character and replace it with ellipses."
(concat (substring string 0 (match-beginning 0))
(if (match-string 1 string) "...")) string))
-(defmacro sbe (source-block &rest variables) ;FIXME: Namespace prefix!
+(defmacro org-sbe (source-block &rest variables)
"Return the results of calling SOURCE-BLOCK with VARIABLES.
Each element of VARIABLES should be a two
element list, whose first element is the name of the variable and
second element is a string of its value. The following call to
-`sbe' would be equivalent to the following source code block.
+`org-sbe' would be equivalent to the following source code block.
- (sbe 'source-block (n $2) (m 3))
+ (org-sbe 'source-block (n $2) (m 3))
#+begin_src emacs-lisp :var results=source-block(n=val_at_col_2, m=3) :results silent
results
@@ -84,7 +84,7 @@ the header argument which can then be passed before all variables
as shown in the example below.
| 1 | 2 | :file nothing.png | nothing.png |
-#+TBLFM: @1$4='(sbe test-sbe $3 (x $1) (y $2))"
+#+TBLFM: @1$4='(org-sbe test-sbe $3 (x $1) (y $2))"
(declare (debug (form form)))
(let* ((header-args (if (stringp (car variables)) (car variables) ""))
(variables (if (stringp (car variables)) (cdr variables) variables)))