summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-31 09:57:49 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-01-31 09:57:49 (GMT)
commitc17e07e94f5356a5eca352b79a11da82a3eca238 (patch)
tree27bf6e95cc1af37bac3b232778920c1034713922
parentad45f6cd7f490e86ccc3b34c47da5afcc98c54a7 (diff)
downloadorg-mode-c17e07e94f5356a5eca352b79a11da82a3eca238.zip
org-mode-c17e07e94f5356a5eca352b79a11da82a3eca238.tar.gz
ob-core.el (org-ts-regexp): Remove duplicate defconst'ing
* ob-core.el (org-ts-regexp): Remove duplicate defconst'ing. (org-babel-result-regexp): Don't use `org-ts-regexp', use a regexp string directly. This is not the best solution, we should be able to use `org-ts-regexp' here, but the dependencies makes it hard. So let's not define org-ts-regexp twice, just use a raw regexp instead, and add a FIXME warning about this.
-rw-r--r--lisp/ob-core.el5
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index 4affbe7..bdf8c54 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -36,8 +36,6 @@
(defvar org-babel-call-process-region-original)
(defvar org-src-lang-modes)
(defvar org-babel-library-of-babel)
-(defconst org-ts-regexp "<\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} ?[^\r\n>]*?\\)>"
- "Regular expression for fast time stamp matching.")
(declare-function show-all "outline" ())
(declare-function org-reduce "org" (CL-FUNC CL-SEQ &rest CL-KEYS))
(declare-function org-mark-ring-push "org" (&optional pos buffer))
@@ -456,7 +454,8 @@ specific header arguments as well.")
(concat "^[ \t]*#\\+"
(regexp-opt org-babel-data-names t)
"\\(\\[\\([[:alnum:]]+\\)\\]\\|\\[\\[\\([[:alnum:]]+\\)\\]\\["
- org-ts-regexp
+ ;; FIXME The string below is `org-ts-regexp'
+ "<\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} ?[^\r\n>]*?\\)>"
"\\]\\]\\)?\\:[ \t]*")
"Regular expression used to match result lines.
If the results are associated with a hash key then the hash will