diff options
| author | Bastien Guerry <bzg@gnu.org> | 2013-11-12 14:06:26 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@gnu.org> | 2013-11-12 14:06:26 +0100 |
| commit | 271672fad74cdbc9065d23d6e6cee1b8540f571b (patch) | |
| tree | d322b956ec0e74ee33b22354ef00839b23b1618d /lisp/org/ob-table.el | |
| parent | f201cf3a8143b0b34b07769fc7d73dd14761b87b (diff) | |
| download | emacs-271672fad74cdbc9065d23d6e6cee1b8540f571b.tar.gz | |
Merge Org version 8.2.3a.
Diffstat (limited to 'lisp/org/ob-table.el')
| -rw-r--r-- | lisp/org/ob-table.el | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/org/ob-table.el b/lisp/org/ob-table.el index 99951cab7bf..8b3e36d735c 100644 --- a/lisp/org/ob-table.el +++ b/lisp/org/ob-table.el @@ -50,7 +50,7 @@ ;; #+TBLFM: $2='(sbe 'fibbd (n $1)) ;;; Code: -(require 'ob) +(require 'ob-core) (defun org-babel-table-truncate-at-newline (string) "Replace newline character with ellipses. @@ -97,9 +97,11 @@ as shown in the example below. (lambda (el) (if (eq '$ el) (prog1 nil (setq quote t)) - (prog1 (if quote - (format "\"%s\"" el) - (org-no-properties el)) + (prog1 + (cond + (quote (format "\"%s\"" el)) + ((stringp el) (org-no-properties el)) + (t el)) (setq quote nil)))) (cdr var))))) variables))) |