summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Schulte <schulte.eric@gmail.com>2010-09-05 19:29:28 -0600
committerEric Schulte <schulte.eric@gmail.com>2010-09-05 19:29:28 -0600
commit07250ec74af3e47121776da4aee045eb650ba9f6 (patch)
tree82cd31715791fe66a41a921892c15a94d2ae1b80
parent9a72fe8718e575b9effe5f9f8c0c08ba919ccd1f (diff)
downloadorg-mode-07250ec74af3e47121776da4aee045eb650ba9f6.tar.gz
tangle: rename `lang' variable to `language' so it is not overridden
- this is required due to recent changes to org-babel-map-src-blocks - thanks to Dan for pointing this out * lisp/ob-tangle.el (org-babel-tangle-collect-blocks): rename `lang' to `language'
-rw-r--r--lisp/ob-tangle.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el
index 5674909..de91094 100644
--- a/lisp/ob-tangle.el
+++ b/lisp/ob-tangle.el
@@ -253,7 +253,7 @@ references."
(save-excursion (end-of-line 1) (forward-char 1) (point)))))
(defvar org-stored-links)
-(defun org-babel-tangle-collect-blocks (&optional lang)
+(defun org-babel-tangle-collect-blocks (&optional language)
"Collect source blocks in the current Org-mode file.
Return an association list of source-code block specifications of
the form used by `org-babel-spec-to-string' grouped by language.
@@ -308,8 +308,8 @@ code blocks by language."
(match-end 0)))
(point))))
by-lang)
- (unless (string= (cdr (assoc :tangle params)) "no") ;; skip
- (unless (and lang (not (string= lang src-lang))) ;; limit by language
+ (unless (string= (cdr (assoc :tangle params)) "no")
+ (unless (and language (not (string= language src-lang)))
;; add the spec for this block to blocks under it's language
(setq by-lang (cdr (assoc src-lang blocks)))
(setq blocks (delq (assoc src-lang blocks) blocks))