aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBastien Guerry2012-05-16 23:53:39 +0200
committerBastien Guerry2012-05-16 23:53:39 +0200
commiteb2adf0a299180c4c78253c8b3ccc9c3da9c3805 (patch)
tree225d82a6b97b7c8471f8b2b3ce2c8d39e938541b
parent8c8b834fa997dbfd1b87abc1368a4680d1833e15 (diff)
downloademacs-eb2adf0a299180c4c78253c8b3ccc9c3da9c3805.tar.gz
emacs-eb2adf0a299180c4c78253c8b3ccc9c3da9c3805.zip
ob.el: Fix bug.
-rw-r--r--lisp/org/ChangeLog5
-rw-r--r--lisp/org/ob.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 3839100ff4d..19f6a15dc9c 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,8 @@
12012-05-16 Eric Schulte <eric.schulte@gmx.com>
2
3 * ob.el (org-babel-parse-src-block-match): Save match data during
4 indentation check.
5
12012-05-16 Bastien Guerry <bzg@gnu.org> 62012-05-16 Bastien Guerry <bzg@gnu.org>
2 7
3 * org.el (org-scan-tags): Correctly match TODO keywords. 8 * org.el (org-scan-tags): Correctly match TODO keywords.
diff --git a/lisp/org/ob.el b/lisp/org/ob.el
index f3b7d6814bd..69d7da4cb0e 100644
--- a/lisp/org/ob.el
+++ b/lisp/org/ob.el
@@ -1159,7 +1159,8 @@ may be specified in the properties of the current outline entry."
1159 (substring body 0 sub-length) 1159 (substring body 0 sub-length)
1160 (or body ""))))) 1160 (or body "")))))
1161 (preserve-indentation (or org-src-preserve-indentation 1161 (preserve-indentation (or org-src-preserve-indentation
1162 (string-match "-i\\>" switches)))) 1162 (save-match-data
1163 (string-match "-i\\>" switches)))))
1163 (list lang 1164 (list lang
1164 ;; get block body less properties, protective commas, and indentation 1165 ;; get block body less properties, protective commas, and indentation
1165 (with-temp-buffer 1166 (with-temp-buffer