ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Bastien Guerry 2013-01-31 10:57:49 +01:00
parent ad45f6cd7f
commit c17e07e94f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ob-core.el
View File

@ -36,8 +36,6 @@
(defvar org-babel-call-process-region-original) (defvar org-babel-call-process-region-original)
(defvar org-src-lang-modes) (defvar org-src-lang-modes)
(defvar org-babel-library-of-babel) (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 show-all "outline" ())
(declare-function org-reduce "org" (CL-FUNC CL-SEQ &rest CL-KEYS)) (declare-function org-reduce "org" (CL-FUNC CL-SEQ &rest CL-KEYS))
(declare-function org-mark-ring-push "org" (&optional pos buffer)) (declare-function org-mark-ring-push "org" (&optional pos buffer))
@ -456,7 +454,8 @@ specific header arguments as well.")
(concat "^[ \t]*#\\+" (concat "^[ \t]*#\\+"
(regexp-opt org-babel-data-names t) (regexp-opt org-babel-data-names t)
"\\(\\[\\([[:alnum:]]+\\)\\]\\|\\[\\[\\([[:alnum:]]+\\)\\]\\[" "\\(\\[\\([[: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]*") "\\]\\]\\)?\\:[ \t]*")
"Regular expression used to match result lines. "Regular expression used to match result lines.
If the results are associated with a hash key then the hash will If the results are associated with a hash key then the hash will