summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2010-01-29 08:20:21 +0100
committerCarsten Dominik <carsten.dominik@gmail.com>2010-01-29 08:20:21 +0100
commitef3c18ed479d9c2245ed5bdcc59d7e651c900e5f (patch)
tree9b0308dfd3b4d7f85fbcd90ee194512bc209ab03
parent2038d614638d1230fc9cb77e994e82fce0643bdc (diff)
parent21849af58b707577806a74c8b371e128b770d5d5 (diff)
downloadorg-mode-ef3c18ed479d9c2245ed5bdcc59d7e651c900e5f.tar.gz
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
-rw-r--r--contrib/babel/lisp/org-babel-tangle.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/babel/lisp/org-babel-tangle.el b/contrib/babel/lisp/org-babel-tangle.el
index c805373..66e2c26 100644
--- a/contrib/babel/lisp/org-babel-tangle.el
+++ b/contrib/babel/lisp/org-babel-tangle.el
@@ -102,9 +102,10 @@ exported source code blocks by language."
((> (length tangle) 0) tangle))
target-file))
(file-name (when base-name
- (if (string= base-name
- (file-name-sans-extension base-name))
- (concat base-name "." ext) base-name))))
+ (if (and ext
+ (string= base-name
+ (file-name-sans-extension base-name)))
+ (concat base-name "." ext) base-name))))
;; ;; debugging
;; (message "tangle=%S base-name=%S file-name=%S"
;; tangle base-name file-name)