Bastien Guerry
00f59ff30b
Merge branch 'hotfix'
2012-04-09 12:35:15 +02:00
Julian Gehring
2d8913f1fc
org.texi: Fix missing links and formatting in 'Exporting' section
2012-04-09 12:35:06 +02:00
Nicolas Goaziou
f188721692
org-element: Fix target interpretation
...
* contrib/lisp/org-element.el (org-element-target-parser): Fix
docstring.
(org-element-target-interpreter): Fix target interpretation.
2012-04-08 18:19:17 +02:00
Nicolas Goaziou
d6faea24d4
org-footnote: Fix bug related to sorting and folded view
...
* lisp/org-footnote.el (org-footnote-delete-definitions): Remove blank
lines before the footnote definition instead of removing those after
it.
* testing/lisp/test-org-footnote.el: Adapt tests.
2012-04-08 12:01:57 +02:00
Nicolas Goaziou
2ff3da0f1a
org-export: Fix footnotes bug in ODT export
...
* contrib/lisp/org-export.el (org-export-as): Reorder actions taken to
fix footnotes bug in ODT export.
2012-04-07 15:14:58 +02:00
Nicolas Goaziou
8453ac1bf3
org-element: Remove dependency on org-footnote predicates
...
* contrib/lisp/org-element.el (org-element-footnote-definition-parser):
Remove the need for `org-footnote-at-definition-p'.
(org-element-footnote-reference-parser): Remove the need for
`org-footnote-at-reference-p'.
(org-element-footnote-reference-successor): Do not use
`org-footnote-get-next-reference'.
* testing/lisp/test-org-element.el: Add test.
2012-04-06 23:50:00 +02:00
Nicolas Goaziou
4019559ee2
org-footnote: Don't grab trailing blank lines in a footnote definition
...
* lisp/org-footnote.el (org-footnote-at-definition-p): Don't grab
trailing blank lines in a footnote definition.
(org-footnote-delete-definitions): Remove both footnote definition and
trailing blank lines.
* testing/lisp/test-org-export.el (test-org-export/fuzzy-links): Fix
a docstring.
* contrib/lisp/org-element.el (org-element-footnote-definition-parser):
Apply change to footnote definitions.
2012-04-06 19:14:51 +02:00
Jambunathan K
8cded57cdb
org-e-odt.el: Merge category strings and short caption changes
2012-04-06 14:34:58 +05:30
Bastien Guerry
e6fdf918a4
Merge branch 'hotfix'
2012-04-06 10:53:24 +02:00
Bastien Guerry
35a5f069d8
Revert "Fix global dynamic variables in org-special-blocks.el."
...
This reverts commit 9054ba39d0
.
The variable `line' is dynamically scoped in org-html and should
not be renamed here.
2012-04-06 10:52:34 +02:00
Jambunathan K
51e7e5dc41
org-e-odt.el: Handle conversion from odt to other formats.
...
Specifically take care of org-e-odt-convert and
org-e-odt-preferred-output-format.
Also other miscellaneous fixes.
2012-04-05 17:30:29 +05:30
Bastien Guerry
4899b81483
Merge branch 'hotfix'
2012-04-05 08:51:51 +02:00
Ippei FURUHASHI
4e35c21c09
doc/org.texi: Fix two typos in Agenda commands
...
doc/org.texi: Fix two typos in Agenda commands
* doc/org.texi (Agenda commands): Fix typos by swapping
the equivalent keybindings to `org-agenda-next-line'
with the ones to `org-agenda-previous-line'.
TINYCHANGE
2012-04-05 08:51:41 +02:00
Jambunathan K
05498b23ab
org-e-odt: Fix handling of inline formula.
...
Also handle #+ODT_STYLES_FILE.
2012-04-05 02:23:18 +05:30
Jambunathan K
5d9c6d5853
org-e-odt: Various improvements
2012-04-04 22:30:54 +05:30
Stephen Eglen
76e7b07872
org-icalendar-timezone: doc string fix
...
* lisp/org-icalendar.el (org-icalendar-timezone): Fix typo and clarify
meaning.
Small typo (of -> or); clarify meaning of how timezone is calculated if
this variable is left as nil.
TINYCHANGE
2012-04-04 09:20:36 +02:00
Chris Gray
6fabe46cc7
Export: Allow for TOC generation if body-only is set
...
* lisp/org-html.el (org-export-as-html): Remove the check for
body-only in the code for generating tables of contents.
The docstring for org-export-as-html states that the body-only flag
removes everything outside the <body></body> tags (inclusive). Since
the table of contents is inside these tags, it should be exported when
requested even if the body-only flag is set.
2012-04-04 08:54:14 +02:00
Bastien Guerry
187f77a20a
org.el: Leave scheduled/deadline lines untouched when filling an adjacent paragraph.
...
* org.el (org-fill-paragraph): Leave scheduled/deadline lines
untouched when filling an adjacent paragraph.
Thanks to Stuart McLean for suggesting this.
2012-04-04 08:51:20 +02:00
Bastien Guerry
ce06791334
Merge branch 'hotfix'
2012-04-04 08:28:45 +02:00
Bastien Guerry
fc374109cd
org.el: Prevent an error when trying to fontify beyond (point-max).
...
* org.el (org-fontify-meta-lines-and-blocks-1): Prevent an
error when trying to fontify beyond (point-max).
TINYCHANGE
Thanks to Leo and Henning for reporting this, and to Nick Dokos
for providing the fix.
2012-04-04 08:28:17 +02:00
Bastien Guerry
72d911cfa2
Merge branch 'hotfix'
...
Conflicts:
lisp/org-capture.el
lisp/org-clock.el
2012-04-03 14:09:12 +02:00
Bastien Guerry
e48d67ed6d
org.el: Fix bug when gathering tag completion options.
...
* org.el (org-fast-tag-selection): Fix bug when gathering tag
completion options.
TINYCHANGE
Thanks to Noorul Islam K M for the patch.
2012-04-03 14:07:26 +02:00
Bastien Guerry
c55604074d
Add :version to org.el options.
2012-04-03 13:53:49 +02:00
Bastien Guerry
38e95cd088
Add :version to org-timer.el option.
2012-04-03 13:48:32 +02:00
Bastien Guerry
1d98ecf980
Add :version to org-src.el option.
2012-04-03 13:44:58 +02:00
Bastien Guerry
7a6b863a76
Add :version to ob-scheme.el option.
2012-04-03 13:44:15 +02:00
Bastien Guerry
6e2207fc0a
Add :version to org-attach.el option.
2012-04-03 13:43:54 +02:00
Bastien Guerry
a0d59ff6a3
Add :version to ob-plantuml.el option.
2012-04-03 13:43:36 +02:00
Bastien Guerry
8ca9c1b195
Add :version to org-capture.el options.
2012-04-03 13:43:06 +02:00
Bastien Guerry
117f14d345
Add :version to ob-exp.el option.
2012-04-03 13:41:59 +02:00
Bastien Guerry
7ffea1b7b9
Add :version to ob-js.el option.
2012-04-03 13:41:37 +02:00
Bastien Guerry
198f585350
Add :version to org-icalendar.el options.
2012-04-03 13:41:12 +02:00
Bastien Guerry
ae4ba1b35c
Add :version to org-agenda.el options.
2012-04-03 13:40:11 +02:00
Bastien Guerry
08ba2acbb3
Add :version to org-taskjuggler.el options.
2012-04-03 13:35:41 +02:00
Bastien Guerry
e77534b8b4
Add :version to org-exp-blocks.el option.
2012-04-03 13:33:59 +02:00
Bastien Guerry
c19f5c3c0d
Add :version to org-list.el options.
2012-04-03 13:32:23 +02:00
Bastien Guerry
cbd1a12295
Add :version to org-archive.el options.
2012-04-03 13:31:35 +02:00
Bastien Guerry
db138ea1f9
Add :version to org-wl.el options.
2012-04-03 13:31:06 +02:00
Bastien Guerry
5bb982881a
Add :version to ob-lisp.el option.
2012-04-03 13:30:07 +02:00
Bastien Guerry
e97aec45a4
Add :version to org-gnus.el option.
2012-04-03 13:29:41 +02:00
Bastien Guerry
346dc97753
Add :version to ob-picolisp.el option.
2012-04-03 13:29:15 +02:00
Bastien Guerry
5e3cf1bd26
Add :version to org-entities.el options.
2012-04-03 13:28:51 +02:00
Bastien Guerry
b846a86cfa
Add :version to ob.el options.
2012-04-03 13:28:23 +02:00
Bastien Guerry
bdd922e3f7
Add :version to org-clock.el options.
2012-04-03 13:27:34 +02:00
Bastien Guerry
d5220e906f
Add :version to org-exp.el options.
2012-04-03 13:26:05 +02:00
Bastien Guerry
8275726e7e
Add :version to org-habit.el options.
2012-04-03 13:24:40 +02:00
Bastien Guerry
cd2f395416
Add :version to org-table.el options.
2012-04-03 13:24:12 +02:00
Bastien Guerry
2894045bba
Add :version to org-docbook.el options.
2012-04-03 13:23:15 +02:00
Bastien Guerry
18a0b31022
Add :version to org-inlinetask.el option.
2012-04-03 13:22:38 +02:00
Bastien Guerry
4b849731f3
Add :version to org-faces.el options.
2012-04-03 13:22:15 +02:00