diff options
author | Carsten Dominik <carsten.dominik@gmail.com> | 2011-04-15 22:31:11 +0200 |
---|---|---|
committer | Carsten Dominik <carsten.dominik@gmail.com> | 2011-04-15 22:31:11 +0200 |
commit | c2c28fc94292b4c9e2bd039add18fe721f2b4d21 (patch) | |
tree | 4e06624f5f2a2c7ea301d8b8b95991597dbf6eaf | |
parent | c56bf33812a0c7ee5ddfa8c73e598348c3bbf47a (diff) | |
parent | 1997e19bd514d81b5989cd3c0bfae87da474d460 (diff) | |
download | org-mode-c2c28fc94292b4c9e2bd039add18fe721f2b4d21.tar.gz |
Merge branch 'master' of orgmode.org:org-mode
-rw-r--r-- | lisp/ob-tangle.el | 3 | ||||
-rw-r--r-- | lisp/org-src.el | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el index b4bd147..5a81f73 100644 --- a/lisp/ob-tangle.el +++ b/lisp/ob-tangle.el @@ -243,7 +243,8 @@ exported source code blocks by language." (org-babel-tangle-collect-blocks lang)) (message "tangled %d code block%s from %s" block-counter (if (= block-counter 1) "" "s") - (file-name-nondirectory (buffer-file-name (current-buffer)))) + (file-name-nondirectory + (buffer-file-name (or (buffer-base-buffer) (current-buffer))))) ;; run `org-babel-post-tangle-hook' in all tangled files (when org-babel-post-tangle-hook (mapc diff --git a/lisp/org-src.el b/lisp/org-src.el index 7d42e00..4ec457c 100644 --- a/lisp/org-src.el +++ b/lisp/org-src.el @@ -153,7 +153,7 @@ but which mess up the display of a snippet in Org exported files.") (defcustom org-src-lang-modes '(("ocaml" . tuareg) ("elisp" . emacs-lisp) ("ditaa" . artist) ("asymptote" . asy) ("dot" . fundamental) ("sqlite" . sql) - ("calc" . fundamental)) + ("calc" . fundamental) ("C" . c)) "Alist mapping languages to their major mode. The key is the language name, the value is the string that should be inserted as the name of the major mode. For many languages this is |