From: Matthew MacLean <archenoth@gmail.com>
To: emacs-orgmode@gnu.org
Subject: fa5fd6351605912ec75e783cb62649 breaks org-babel-script-escape for ob-ruby
Date: Tue, 11 Aug 2015 14:52:39 -0600 [thread overview]
Message-ID: <CA+GZiYozqNe7T+A3_n0x=bEV3bPBcGn2zpmwxK5Zc2EDS6jnHQ@mail.gmail.com> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 905 bytes --]
Yo~!
fa5fd6351605912ec75e783cb626497b1ebe471e introduced a change where
org-babel-script-escape stopped accepting numbers. This caused an issue in
ob-ruby.el where when trying to evaluate something like "2 + 2", you would
get the message:
`org-babel-script-escape' expects a string
This broke evaluation of Ruby code blocks.
I suspect this is not the only location where this problem might arise, so
I am submitting a patch so the function simply returns numbers if they are
passed in rather than dying. (Because numbers don't need to be escaped, and
this was the previous behaviour.)
Thanks..!
By the way, sorry if this ends up being a duplicate... I learned not so
long ago I needed to subscribe to actually post here and wasn't sure if my
last post went to /dev/null or is just awaiting moderation. (I tested to
make sure the patch still works with the most recent commit of the maint
branch.)
[-- Attachment #1.2: Type: text/html, Size: 1048 bytes --]
[-- Attachment #2: org-babel-script-escape-numbers.patch --]
[-- Type: text/x-patch, Size: 2814 bytes --]
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index e3abe97..01c4da8 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -2813,34 +2813,37 @@ block but are passed literally to the \"example-block\"."
(error "Unterminated string in `org-babel-script-escape'"))
(apply #'string (reverse out))))
-(defun org-babel-script-escape (str &optional force)
- "Safely convert tables into elisp lists."
- (unless (stringp str)
- (error "`org-babel-script-escape' expects a string"))
- (let ((escaped
- (cond
- ((and (> (length str) 2)
- (or (and (string-equal "[" (substring str 0 1))
- (string-equal "]" (substring str -1)))
- (and (string-equal "{" (substring str 0 1))
- (string-equal "}" (substring str -1)))
- (and (string-equal "(" (substring str 0 1))
- (string-equal ")" (substring str -1)))))
-
- (concat "'" (org-babel--script-escape-inner str)))
- ((or force
- (and (> (length str) 2)
- (or (and (string-equal "'" (substring str 0 1))
- (string-equal "'" (substring str -1)))
- ;; We need to pass double-quoted strings
- ;; through the backslash-twiddling bits, even
- ;; though we don't need to change their
- ;; delimiters.
- (and (string-equal "\"" (substring str 0 1))
- (string-equal "\"" (substring str -1))))))
- (org-babel--script-escape-inner str))
- (t str))))
- (condition-case nil (org-babel-read escaped) (error escaped))))
+(defun org-babel-script-escape (val &optional force)
+ "Safely convert passed in values (including collections of
+them; tables) into elisp lists."
+ (if (numberp val)
+ val
+ (unless (stringp val)
+ (error "`org-babel-script-escape' expects a string or number"))
+ (let ((escaped
+ (cond
+ ((and (> (length val) 2)
+ (or (and (string-equal "[" (substring val 0 1))
+ (string-equal "]" (substring val -1)))
+ (and (string-equal "{" (substring val 0 1))
+ (string-equal "}" (substring val -1)))
+ (and (string-equal "(" (substring val 0 1))
+ (string-equal ")" (substring val -1)))))
+
+ (concat "'" (org-babel--script-escape-inner val)))
+ ((or force
+ (and (> (length val) 2)
+ (or (and (string-equal "'" (substring val 0 1))
+ (string-equal "'" (substring val -1)))
+ ;; We need to pass double-quoted strings
+ ;; through the backslash-twiddling bits, even
+ ;; though we don't need to change their
+ ;; delimiters.
+ (and (string-equal "\"" (substring val 0 1))
+ (string-equal "\"" (substring val -1))))))
+ (org-babel--script-escape-inner val))
+ (t val))))
+ (condition-case nil (org-babel-read escaped) (error escaped)))))
(defun org-babel-read (cell &optional inhibit-lisp-eval)
"Convert the string value of CELL to a number if appropriate.
next reply other threads:[~2015-08-11 20:53 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-11 20:52 Matthew MacLean [this message]
2015-08-11 22:33 ` fa5fd6351605912ec75e783cb62649 breaks org-babel-script-escape for ob-ruby Kyle Meyer
2015-08-11 22:36 ` Kyle Meyer
2015-08-11 22:46 ` Matthew MacLean
2015-08-12 0:52 ` Kyle Meyer
2015-08-12 3:24 ` Matthew MacLean
2015-08-12 5:53 ` Kyle Meyer
2015-08-12 6:18 ` Matthew MacLean
2015-08-12 17:21 ` Kyle Meyer
2015-08-12 20:05 ` Matthew MacLean
2015-08-13 3:41 ` Kyle Meyer
2015-08-13 4:02 ` Matthew MacLean
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CA+GZiYozqNe7T+A3_n0x=bEV3bPBcGn2zpmwxK5Zc2EDS6jnHQ@mail.gmail.com' \
--to=archenoth@gmail.com \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).