summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJambunathan K <kjambunathan@gmail.com>2012-04-20 23:15:06 +0530
committerJambunathan K <kjambunathan@gmail.com>2012-04-20 23:15:06 +0530
commit3f427d92c89a979b6948782ee133a85b8c167660 (patch)
tree8bc194e632ade705e6988573d605b27b0d9a8359
parent6f78edd68c78ff1cf5d85c3fa337ca4c048389a8 (diff)
parent7d4e7a8763eff82e11253deba0dbd148db87f2c8 (diff)
downloadorg-mode-3f427d92c89a979b6948782ee133a85b8c167660.tar.gz
Merge remote-tracking branch 'origin/hotfix-7.8.06'
-rw-r--r--etc/styles/OrgOdtStyles.xml20
-rw-r--r--etc/styles/README2
-rw-r--r--lisp/org-odt.el1
3 files changed, 11 insertions, 12 deletions
diff --git a/etc/styles/OrgOdtStyles.xml b/etc/styles/OrgOdtStyles.xml
index b2f9a85..5dfcfa8 100644
--- a/etc/styles/OrgOdtStyles.xml
+++ b/etc/styles/OrgOdtStyles.xml
@@ -654,34 +654,34 @@
<!-- Description List -->
<text:list-style style:name="OrgDescriptionList">
<text:list-level-style-number text:level="1" style:num-format="">
- <style:list-level-properties text:space-before="0.635cm" text:min-label-width="0.635cm"/>
+ <style:list-level-properties text:space-before="0.635cm"/>
</text:list-level-style-number>
<text:list-level-style-number text:level="2" style:num-format="">
- <style:list-level-properties text:space-before="1.27cm" text:min-label-width="0.635cm"/>
+ <style:list-level-properties text:space-before="1.27cm"/>
</text:list-level-style-number>
<text:list-level-style-number text:level="3" style:num-format="">
- <style:list-level-properties text:space-before="1.905cm" text:min-label-width="0.635cm"/>
+ <style:list-level-properties text:space-before="1.905cm"/>
</text:list-level-style-number>
<text:list-level-style-number text:level="4" style:num-format="">
- <style:list-level-properties text:space-before="2.54cm" text:min-label-width="0.635cm"/>
+ <style:list-level-properties text:space-before="2.54cm"/>
</text:list-level-style-number>
<text:list-level-style-number text:level="5" style:num-format="">
- <style:list-level-properties text:space-before="3.175cm" text:min-label-width="0.635cm"/>
+ <style:list-level-properties text:space-before="3.175cm"/>
</text:list-level-style-number>
<text:list-level-style-number text:level="6" style:num-format="">
- <style:list-level-properties text:space-before="3.81cm" text:min-label-width="0.635cm"/>
+ <style:list-level-properties text:space-before="3.81cm"/>
</text:list-level-style-number>
<text:list-level-style-number text:level="7" style:num-format="">
- <style:list-level-properties text:space-before="4.445cm" text:min-label-width="0.635cm"/>
+ <style:list-level-properties text:space-before="4.445cm"/>
</text:list-level-style-number>
<text:list-level-style-number text:level="8" style:num-format="">
- <style:list-level-properties text:space-before="5.08cm" text:min-label-width="0.635cm"/>
+ <style:list-level-properties text:space-before="5.08cm"/>
</text:list-level-style-number>
<text:list-level-style-number text:level="9" style:num-format="">
- <style:list-level-properties text:space-before="5.715cm" text:min-label-width="0.635cm"/>
+ <style:list-level-properties text:space-before="5.715cm"/>
</text:list-level-style-number>
<text:list-level-style-number text:level="10" style:num-format="">
- <style:list-level-properties text:space-before="6.35cm" text:min-label-width="0.635cm"/>
+ <style:list-level-properties text:space-before="6.35cm"/>
</text:list-level-style-number>
</text:list-style>
diff --git a/etc/styles/README b/etc/styles/README
index bdebef3..206f3a2 100644
--- a/etc/styles/README
+++ b/etc/styles/README
@@ -1,7 +1,7 @@
The files OrgOdtContentTemplate.xml and OrgOdtStyles.xml have the
following copyright information:
-Copyright (C) 2010-2011 Free Software Foundation, Inc.
+Copyright (C) 2010-2012 Free Software Foundation, Inc.
These files are part of GNU Emacs.
diff --git a/lisp/org-odt.el b/lisp/org-odt.el
index bf0a8cb..16c63a6 100644
--- a/lisp/org-odt.el
+++ b/lisp/org-odt.el
@@ -1696,7 +1696,6 @@ ATTR is a string of other attributes of the a element."
(or (not thefile) (string= thefile ""))
(plist-get org-lparse-opt-plist :section-numbers)
(setq sec-frag fragment)
- (org-find-text-property-in-string 'org-no-description fragment)
(or (string-match "\\`sec\\(\\(-[0-9]+\\)+\\)" sec-frag)
(and (setq sec-frag
(loop for alias in org-export-target-aliases do