424a1c5d2f
correct reference to non-existing source file
...
* contrib/lisp/org-export.el: Correct reference to non-existing source
file, org-exp-blocks has been removed and the imported function is
now in ob-exp.
2012-10-07 19:16:20 +02:00
12e59b66d1
Merge branch 'maint'
2012-10-07 18:13:06 +02:00
93f4b7c6d8
remove utf-8 codepoints in docstrings
...
* lisp/org.el: Remove utf-8 codepoints in docstrings, bytecode doesn't
work when loaded from compressed files.
Probably a bug in Emacs, but since this is unlikely to be fixed in old
Emacsen, simply don't do it.
2012-10-07 18:11:40 +02:00
4b9db1cce0
declare function org-solidify-link-text
...
* contrib/lisp/org-e-odt.el: Declare function org-solidify-link-text
from org-exp.
2012-10-07 18:11:36 +02:00
d56ad98544
fix a possible (wrong-type-argument stringp nil) error
...
* lisp/org-compat.el: Make sure that file-name-directory is getting a
stringp. This avoids a possible "(wrong-type-argument stringp nil)"
error when the library in question does not exist.
2012-10-07 18:11:33 +02:00
b47a7d5125
refer to libraries only by name
...
* contrib/lisp/org-e-odt.el: Replace arc-mode.el -> arc-mode.
* lisp/org-odt.el: Replace arc-mode.el -> arc-mode.
* lisp/org.el: Replace org-macs.el -> org-macs.
2012-10-07 18:11:25 +02:00
956858a395
org-export: Fix menu leak when reloading Org
...
* contrib/lisp/org-export.el (org-export-define-backend,
org-export-define-derived-backend): Make sure a given entry won't be
added to menu more than once.
2012-10-06 22:04:27 +02:00
36306bae4e
org-e-publish: Fix type mismatch error
...
* contrib/lisp/org-e-publish.el (org-e-publish-find-title): Store
title as a string, not as a secondary string.
2012-10-06 19:44:04 +02:00
f461a10532
org-e-publish: Fix publishing to PDF
...
* contrib/lisp/org-e-publish.el (org-e-publish-org-to-pdf): First
publish in base directory, then move results to publishing
directory. It allows to correctly publish a document with images
generated by some Babel code.
2012-10-06 19:43:32 +02:00
b0938f684e
Merge branch 'maint'
2012-10-06 11:18:22 +02:00
20ac3a3b36
introduce dummy org-install.el to catch old installations
...
* lisp/Makefile: Arrange for an uncompiled org-install.el. This also
ensures that if there's an old org-install.el in the installation
directory, it will be replaced and not linger.
* lisp/org-install.el: Provide an empty file that prints a warning
about an outdated configuration.
2012-10-06 11:16:59 +02:00
58b42debb1
org-export: Include title, author, date and email macros
...
* contrib/lisp/org-export.el (org-export-expand-macro): New function.
(org-export-as): Use new function.
* lisp/org.el (org-macro-expand, org-macro-replace-all): Change
signature. The function now accepts an alist of templates so it
doesn't have to rely only on `org-macro-templates'.
(org-macro-initialize-templates): {{{date}}} is not anymore an alias
for {{{time}}}. During export, it will provide the value stored in
DATE keyword instead.
* testing/lisp/test-org-export.el: Add tests.
* testing/lisp/test-org.el: Update tests.
2012-10-06 10:29:37 +02:00
0af2f6068f
org-export: Fix comma escape in included files
...
* contrib/lisp/org-export.el (org-export-expand-include-keyword): Use
new functions to comma escape contents of included files when in an
example or a src block.
2012-10-06 09:19:41 +02:00
2c78ca4a56
Merge branch 'maint'
...
Conflicts:
lisp/org-element.el
2012-10-06 01:21:27 +02:00
ad99ea9147
org-element: Fix parsing with trailing spaces at eob
...
* lisp/org-element.el (org-element-center-block-parser,
org-element-drawer-parser, , org-element-footnote-definition-parser,
org-element-inlinetask-parser, org-element-plain-list-parser,
org-element-quote-block-parser, org-element-special-block-parser,
org-element-babel-call-parser, org-element-clock-parser,
org-element-comment-parser, org-element-comment-block-parser,
org-element-example-block-parser, org-element-export-block-parser,
org-element-fixed-width-parser, org-element-horizontal-rule-parser,
org-element-keyword-parser, org-element-latex-environment-parser,
org-element-paragraph-parser, org-element-planning-parser,
org-element-property-drawer-parser, org-element-src-block-parser,
org-element-table-parser,
org-element-verse-block-parserorg-element-dynamic-block-parser):
Make sure element never ends at the end of a blank non-empty line.
* testing/lisp/test-org-element.el: Add test.
2012-10-06 01:02:03 +02:00
78d2bd7edc
Merge branch 'maint'
2012-10-05 15:08:58 +02:00
daf8cf030c
org-element: Fix `org-element-context' when in recursive objects
...
* lisp/org-element.el (org-element-context,
org-element--get-next-object-candidates): Fix `org-element-context'.
In particular, the restrictions for an object may be different from
those of its container (i.e. table rows and table cells).
* testing/lisp/test-org-element.el: Add tests.
2012-10-05 15:02:55 +02:00
e5e49ea327
org-e-groff, org-e-man, org-e-texinfo: Silence byte-compiler
2012-10-04 14:48:06 +02:00
e4799ef25e
org-export: Remove unused function declarations
2012-10-04 14:42:51 +02:00
0408270ad2
Put the clocktable summary line as a CAPTION
...
* org-clock.el (org-clocktable-write-default): Insert the summary as a
standard #+CAPTION keyword for the (clock) table.
2012-10-04 14:13:39 +02:00
2e94271bd1
Merge branch 'maint'
2012-10-03 12:15:35 +02:00
21478e1733
Revert "org-odt.el (and org-e-odt.el): Simplify the way style/schema files are found"
...
This reverts commit d042e3add1
2012-10-03 12:13:47 +02:00
5c9006de49
Revert "Fix previous commit."
...
This reverts commit 5f9177ad3a
2012-10-03 12:13:33 +02:00
1a029166a7
Revert "Fix compiler warnings introduced in commit d042e3a."
...
This reverts commit 79e907fd8c
2012-10-03 12:13:26 +02:00
eba20536e9
Revert "org-e-odt.el: Bugfix: default to the correct directory for styles."
...
This reverts commit 27c6737813
2012-10-03 12:13:17 +02:00
156b42e4f2
Revert "org-odt.el (org-odt-styles-dir): Try more directories"
...
This reverts commit fc8ad1347e
2012-10-03 12:13:07 +02:00
7dd847c685
Revert "mk/default.mk: Restore datadir."
...
This reverts commit ded873cb8f
2012-10-03 12:12:59 +02:00
34681fb135
Merge branch 'maint'
2012-10-03 12:05:03 +02:00
ded873cb8f
mk/default.mk: Restore datadir.
2012-10-03 12:04:51 +02:00
50fe7cc631
Merge branch 'maint'
2012-10-03 11:33:37 +02:00
240432e66d
lisp/Makefile: Make sure to remove org-install.el from a previous install
2012-10-03 11:32:46 +02:00
83dbbfed28
Merge branch 'maint'
2012-10-03 11:14:16 +02:00
562aec40dd
Fix commit 1dd4228.
2012-10-03 11:14:06 +02:00
1700ea7722
Merge branch 'maint'
2012-10-03 10:30:54 +02:00
fc8ad1347e
org-odt.el (org-odt-styles-dir): Try more directories
...
* org-odt.el (org-odt-styles-dir): Try more directories.
Don't throw an error, just send a message.
Thanks to Nick Dokos for reporting this.
2012-10-03 10:30:40 +02:00
27c6737813
org-e-odt.el: Bugfix: default to the correct directory for styles.
...
* org-e-odt.el (org-e-odt-styles-dir): Try more directories.
Don't throw an error, just send a message.
(org-e-odt): Fix a bug about deactivating an advice that was
activated by org-odt.el, not org-e-odt.el.
Thanks to Nick Dokos for reporting this.
2012-10-03 10:28:43 +02:00
09d6bcda98
org-md: Fix function call from dispatcher
2012-10-02 22:44:04 +02:00
1ef9eed3cf
Merge branch 'maint'
2012-10-02 18:08:00 +02:00
98bc46731a
org.texi (Installation): Update the link to Org's ELPA
...
* org.texi (Installation): Update the link to Org's ELPA.
2012-10-02 18:07:50 +02:00
36b95d4491
Merge branch 'maint'
2012-10-02 17:58:00 +02:00
79e907fd8c
Fix compiler warnings introduced in commit d042e3a.
2012-10-02 17:57:51 +02:00
30235e6773
Merge branch 'maint'
2012-10-02 17:38:56 +02:00
5f9177ad3a
Fix previous commit.
2012-10-02 17:38:41 +02:00
154c4c8762
org.el (org-deadline-close): Use `org-time-stamp-to-now'
...
* org.el (org-deadline-close): Use `org-time-stamp-to-now'.
2012-10-02 17:37:56 +02:00
a9c5399983
org.el: Use `org-float-time' instead f the obsolete `time-to-seconds' function
...
* org.el (org-time-stamp-to-now): Use `org-float-time' instead
of the obsolete `time-to-seconds' function.
2012-10-02 15:19:35 +02:00
410c5cb9e4
Merge branch 'maint'
2012-10-02 14:48:13 +02:00
d042e3add1
org-odt.el (and org-e-odt.el): Simplify the way style/schema files are found
...
* org-odt.el (org-odt-lib-dir, org-odt-data-dir)
(org-odt-schema-dir-list, org-odt-styles-dir-list): Delete.
(org-export-odt-schema-dir, org-odt-styles-dir): Infer the
correct directories without requiring other variables.
* org-fixup.el (org-make-org-version, org-make-autoloads):
Don't define `org-odt-data-dir' in org-version.el.
* contrib/lisp/org-e-odt.el (org-e-odt-lib-dir, org-e-odt-data-dir)
(org-e-odt-schema-dir-list, org-e-odt-styles-dir-list): Delete.
(org-e-odt-schema-dir, org-e-odt-styles-dir): Infer the
correct directories without requiring other variables.
2012-10-02 14:47:04 +02:00
4f0b3bfe0c
Merge branch 'maint'
2012-10-02 13:07:09 +02:00
16e0730342
Fix references to org-install.el.
...
Use org-loaddefs.el when needed.
Update README_maintainer wrt this.
2012-10-02 12:19:39 +02:00
e1a01d5077
org.el: Fix references to org-install.el.
...
* org.el ("org-loaddefs.el"): Don't throw an error if the file
cannot be fund.
(org-version): Use org-loaddefs.el instead of org-install.el.
2012-10-02 12:18:51 +02:00
Achim Gratz
Nicolas Goaziou
Sebastien Vauban
Bastien Guerry