From a95c05773e503cc8f420ab3ce41bc71c480c263d Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Fri, 19 Feb 2010 11:34:16 -0500 Subject: [PATCH] babel: Fix unquoting of strings Before this change we have #+begin_src ruby :results value :session ["1", "3"] #+end_src #+results: : 1", "3 After, we have #+begin_src ruby :results value :session ["1", "3"] #+end_src #+results: | 1 | 3 | --- contrib/babel/lisp/langs/org-babel-haskell.el | 2 +- contrib/babel/lisp/langs/org-babel-python.el | 4 ++-- contrib/babel/lisp/langs/org-babel-ruby.el | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/babel/lisp/langs/org-babel-haskell.el b/contrib/babel/lisp/langs/org-babel-haskell.el index 2ce98c490..88916334d 100644 --- a/contrib/babel/lisp/langs/org-babel-haskell.el +++ b/contrib/babel/lisp/langs/org-babel-haskell.el @@ -81,7 +81,7 @@ (defun org-babel-haskell-read-string (string) "Strip \\\"s from around haskell string" - (if (string-match "\"\\([^\000]+\\)\"" string) + (if (string-match "^\"\\([^\000]+\\)\"$" string) (match-string 1 string) string)) diff --git a/contrib/babel/lisp/langs/org-babel-python.el b/contrib/babel/lisp/langs/org-babel-python.el index 388fa655a..ad6859aef 100644 --- a/contrib/babel/lisp/langs/org-babel-python.el +++ b/contrib/babel/lisp/langs/org-babel-python.el @@ -208,8 +208,8 @@ last statement in BODY, as elisp." (org-babel-python-table-or-string (org-babel-trim (car results)))))))))) (defun org-babel-python-read-string (string) - "Strip 's from around ruby string" - (if (string-match "'\\([^\000]+\\)'" string) + "Strip 's from around python string" + (if (string-match "^'\\([^\000]+\\)'$" string) (match-string 1 string) string)) diff --git a/contrib/babel/lisp/langs/org-babel-ruby.el b/contrib/babel/lisp/langs/org-babel-ruby.el index 27de42f4a..1cac05cb3 100644 --- a/contrib/babel/lisp/langs/org-babel-ruby.el +++ b/contrib/babel/lisp/langs/org-babel-ruby.el @@ -202,7 +202,7 @@ last statement in BODY, as elisp." (defun org-babel-ruby-read-string (string) "Strip \\\"s from around ruby string" - (if (string-match "\"\\([^\000]+\\)\"" string) + (if (string-match "^\"\\([^\000]+\\)\"$" string) (match-string 1 string) string))