summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Schulte <schulte.eric@gmail.com>2010-06-13 14:27:49 -0700
committerEric Schulte <schulte.eric@gmail.com>2010-06-13 14:27:49 -0700
commite9b132d8ba6c14acc22166c0fa26814503936b2e (patch)
tree70d85b8a67d59df547f1ccf007c137dbb0f5c403
parent33445118cf2b88b3da5caf97b665c8887911e1f8 (diff)
downloadorg-mode-e9b132d8ba6c14acc22166c0fa26814503936b2e.tar.gz
fixed #+include file bug when :prefix was nil but :prefix1 was set
* lisp/org-exp.el (org-get-file-contents): by un-setting prefix1 to "" instead of to nil we avoid errors when :prefix1 is defined, but prefix is not.
-rw-r--r--lisp/org-exp.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index 3d9541b..915e1f5 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -2013,7 +2013,7 @@ take care of the block they are in."
(goto-char (point-min))
(while (not (eobp))
(insert (or prefix1 prefix))
- (setq prefix1 nil)
+ (setq prefix1 "")
(beginning-of-line 2)))
(buffer-string)
(when (member markup '("src" "example"))