diff options
author | Nicolas Goaziou <n.goaziou@gmail.com> | 2013-11-06 19:17:39 +0100 |
---|---|---|
committer | Nicolas Goaziou <n.goaziou@gmail.com> | 2013-11-06 19:17:39 +0100 |
commit | 0656278de4e54444c406fb50ea384636d606d47c (patch) | |
tree | 389e2bea9d93941e7e8a28f93b0826b939529a80 | |
parent | 7ffc460c7f11907297caf3e253e84b7c5b75c565 (diff) | |
parent | 92f89eedbad33376ffbcc383f1167f8bfa11ca05 (diff) | |
download | org-mode-0656278de4e54444c406fb50ea384636d606d47c.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-element.el | 2 | ||||
-rw-r--r-- | lisp/ox-org.el | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/org-element.el b/lisp/org-element.el index f6343b8..eacdb65 100644 --- a/lisp/org-element.el +++ b/lisp/org-element.el @@ -860,7 +860,7 @@ CONTENTS is the contents of the element." (commentedp (org-element-property :commentedp headline)) (quotedp (org-element-property :quotedp headline)) (pre-blank (or (org-element-property :pre-blank headline) 0)) - (heading (concat (make-string level ?*) + (heading (concat (make-string (org-reduced-level level) ?*) (and todo (concat " " todo)) (and quotedp (concat " " org-quote-string)) (and commentedp (concat " " org-comment-string)) diff --git a/lisp/ox-org.el b/lisp/ox-org.el index 022474a..41798b3 100644 --- a/lisp/ox-org.el +++ b/lisp/ox-org.el @@ -130,6 +130,8 @@ CONTENTS is its contents, as a string or nil. INFO is ignored." (org-element-put-property headline :tags nil)) (unless (plist-get info :with-priority) (org-element-put-property headline :priority nil)) + (org-element-put-property headline :level + (org-export-get-relative-level headline info)) (org-element-headline-interpreter headline contents)) (defun org-org-keyword (keyword contents info) |