summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Schulte <eric.schulte@gmx.com>2012-02-01 08:05:00 -0700
committerEric Schulte <eric.schulte@gmx.com>2012-02-01 08:19:29 -0700
commit4b59c36b035948e6336fd0a7e311e80f338aa6af (patch)
treee1e81b1d2f1a711bd210c00393b6ab1a7eb2c54c
parent347b1a1d2f3977a3959bdd117e2cb759c1be771c (diff)
downloadorg-mode-4b59c36b035948e6336fd0a7e311e80f338aa6af.tar.gz
adding default argument to org-babel-noweb-wrap
This makes it easier to keep consistent behavior. * lisp/ob-tangle.el (org-babel-tangle-clean): Just use default value. * lisp/ob.el (org-babel-noweb-wrap): Add default value. (org-babel-expand-noweb-references): Just use default value.
-rw-r--r--lisp/ob-tangle.el2
-rw-r--r--lisp/ob.el10
2 files changed, 6 insertions, 6 deletions
diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el
index cf507c0..4f66fd8 100644
--- a/lisp/ob-tangle.el
+++ b/lisp/ob-tangle.el
@@ -281,7 +281,7 @@ references."
(interactive)
(goto-char (point-min))
(while (or (re-search-forward "\\[\\[file:.*\\]\\[.*\\]\\]" nil t)
- (re-search-forward (org-babel-noweb-wrap "[^[:space:]]*") nil t))
+ (re-search-forward (org-babel-noweb-wrap) nil t))
(delete-region (save-excursion (beginning-of-line 1) (point))
(save-excursion (end-of-line 1) (forward-char 1) (point)))))
diff --git a/lisp/ob.el b/lisp/ob.el
index 48c8c5f..49b542a 100644
--- a/lisp/ob.el
+++ b/lisp/ob.el
@@ -132,8 +132,10 @@ See also `org-babel-noweb-wrap-start'."
:group 'org-babel
:type 'string)
-(defun org-babel-noweb-wrap (regexp)
- (concat org-babel-noweb-wrap-start regexp org-babel-noweb-wrap-end))
+(defun org-babel-noweb-wrap (&optional regexp)
+ (concat org-babel-noweb-wrap-start
+ (or regexp "\\([^ \t\n].+?[^ \t]\\|[^ \t\n]\\)")
+ org-babel-noweb-wrap-end))
(defvar org-babel-src-name-regexp
"^[ \t]*#\\+name:[ \t]*"
@@ -2178,9 +2180,7 @@ block but are passed literally to the \"example-block\"."
(with-temp-buffer
(insert body) (goto-char (point-min))
(setq index (point))
- (while (and (re-search-forward (org-babel-noweb-wrap
- "\\([^ \t\n].+?[^ \t]\\|[^ \t\n]\\)")
- nil t))
+ (while (and (re-search-forward (org-babel-noweb-wrap) nil t))
(save-match-data (setf source-name (match-string 1)))
(save-match-data (setq evaluate (string-match "\(.*\)" source-name)))
(save-match-data