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
c7d6970864
Fix manuals: don't mention (require 'org-install) anymore.
...
* org.texi (Installation): Don't mention org-install.el
anymore as the replacement file org-loaddefs.el is now loaded
by org.el.
* orgguide.texi (Installation): Ditto.
2012-10-02 12:17:30 +02:00
5dcca72011
Use org-loaddefs.el instead of org-install.el.
2012-10-02 11:30:24 +02:00
5fc07bce0a
Declare functions and variables.
2012-10-02 11:19:29 +02:00
30f1a62878
Update autoloads.
...
* org.el: Don't dynamically autoload already autoloaded
functions.
(org-clock-update-time-maybe): Move to org-clock.el.
* org-exp.el (org-insert-export-options-template): Remove
autoload cookie.
* org-clock.el (org-resolve-clocks, org-clock-in)
(org-clock-out, org-clock-cancel, org-clock-goto)
(org-clock-sum, org-clock-display, org-clock-report)
(org-dblock-write:clocktable): Add autoload cookie.
(org-clock-update-time-maybe): Moved from org.el.
* org-beamer.el (org-beamer-sectioning, org-beamer-mode): Ditto.
* org-ascii.el (org-export-ascii-preprocess): Ditto.
* org-archive.el (org-archive-subtree)
(org-archive-to-archive-sibling, org-toggle-archive-tag): Add
autoload cookie.
* org-colview.el (org-columns, org-dblock-write:columnview)
(org-insert-columns-dblock, org-agenda-columns): Ditto.
* org-table.el (org-table-create-with-table.el)
(org-table-create-or-convert-from-region, org-table-create)
(org-table-convert-region, org-table-import)
(org-table-export, org-table-align)
(org-table-justify-field-maybe, org-table-next-field)
(org-table-previous-field, org-table-next-row)
(org-table-copy-down, org-table-field-info)
(org-table-current-dline, org-table-goto-column)
(org-table-insert-column, org-table-delete-column)
(org-table-move-column-right, org-table-move-column-left)
(org-table-move-column, org-table-move-row-down)
(org-table-move-row-up, org-table-move-row)
(org-table-insert-row, org-table-insert-hline)
(org-table-hline-and-move, org-table-kill-row)
(org-table-sort-lines, org-table-cut-region)
(org-table-copy-region, org-table-paste-rectangle)
(org-table-convert, org-table-wrap-region)
(org-table-edit-field, org-table-sum)
(org-table-get-stored-formulas)
(org-table-maybe-eval-formula)
(org-table-rotate-recalc-marks)
(org-table-maybe-recalculate-line, org-table-eval-formula)
(org-table-recalculate, org-table-iterate)
(org-table-edit-formulas)
(org-table-toggle-coordinate-overlays)
(org-table-toggle-formula-debugger, orgtbl-to-generic)
(orgtbl-to-tsv, orgtbl-to-csv, orgtbl-to-latex)
(orgtbl-to-html, orgtbl-to-texinfo, orgtbl-to-orgtbl): Ditto.
2012-10-02 10:52:17 +02:00
5c762bbdc6
Remove some autoloads and clean up code.
...
* org.el (turn-on-orgtbl): Moved here from org-table.el.
(org-clock-persistence-insinuate): Moved here from org-clock.el.
(org-update-all-dblocks, org-map-entries)
(org-require-autoloaded-modules, org-forward-element)
(org-backward-element, org-up-element)
(org-element-greater-elements, org-drag-element-backward)
(org-drag-element-forward, org-mark-element)
(org-narrow-to-element, org-transpose-element)
(org-unindent-buffer): Don't autoload.
* org-clock.el (org-clock-get-clocktable): Rename from
`org-get-clocktable'.
(org-clock-persistence-insinuate): Move to org.el.
* org-capture.el: Do no set `generated-autoload-file' locally.
Minor code clean up.
* org-agenda.el (org-agenda-list): Use
`org-clock-get-clocktable'. Do no set
`generated-autoload-file' locally.
* org-table.el (org-table-iterate-buffer-tables): Minor
reformatting.
(turn-on-orgtbl): Move to org.el.
* org-html.el (org-export-htmlize-generate-css): Don't autoload.
* org-timer.el (org-timer-pause-or-continue, org-timer-stop):
Ditto.
* ob-tangle.el (org-babel-tangle-lang-exts): Ditto.
* ob-lob.el (org-babel-lob-ingest): Ditto.
* org-id.el (org-id-copy)
(org-id-get-with-outline-path-completion)
(org-id-get-with-outline-drilling): Ditto.
* org-lparse.el (org-lparse-and-open, org-lparse-batch)
(org-lparse-to-buffer, org-replace-region-by)
(org-lparse-region): Ditto.
* org-mobile.el (org-mobile-create-sumo-agenda): Ditto.
2012-10-02 10:03:15 +02:00
4663f961c9
org-publish.el: Minor code clean up.
2012-10-02 10:00:01 +02:00
641a9243fe
org-bbdb.el: Minor code clean up.
2012-10-02 09:57:10 +02:00
63d8c8ea0e
ob.el: Minor code clean up.
2012-10-02 09:55:42 +02:00
e4c31cf98b
Use generated-autoload-file: "org-loaddefs.el" as a local variable.
2012-10-02 08:50:46 +02:00
2a95a47c5f
Merge branch 'maint'
2012-10-01 21:37:48 +02:00
3bd22fb045
org-element: Store value of example-blocks and src-blocks unescaped
...
* lisp/org-element.el (org-element-example-block-parser,
org-element-src-block-parser): Store value of example-blocks and
src-blocks unescaped.
(org-element-example-block-interpreter,
org-element-src-block-interpreter): Escape value again when storing
it.
* contrib/lisp/org-export.el (org-export-unravel-code): Don't clean
commas from code since org-element already took care of it.
* testing/lisp/test-org-export.el: Update test.
* testing/lisp/test-org-element.el: Add tests.
2012-10-01 21:35:50 +02:00
fac86b03fe
Normalize comma-escaping of src-blocks and example-blocks
...
* lisp/org-src.el (org-escape-code-in-string,
org-unescape-code-in-string, org-escape-code-in-region,
org-unescape-code-in-region): New functions.
(org-edit-src-code, org-edit-src-exit): Use new functions.
* lisp/org.el (org-strip-protective-commas): Removed function.
* lisp/org-exp.el (org-export-select-backend-specific-text): Use new
function.
* lisp/ob.el (org-babel-parse-src-block-match,
org-babel-parse-inline-src-block-match, org-babel-insert-result):
Always escape produced blocks, independently on the language of the
block, if any. Use new functions.
* doc/org.texi: Update documentation.
* testing/lisp/test-ob.el: Update test.
2012-10-01 21:24:00 +02:00
180fd62245
Merge branch 'maint'
2012-10-01 19:00:18 +02:00
857a3921af
testing/lisp/test-ob-lilypond.el: Use "w32" or "windows-nt" instead of "win32"
2012-10-01 19:00:14 +02:00
b134c60454
Merge branch 'maint'
...
Conflicts:
lisp/org-agenda.el
2012-10-01 17:56:11 +02:00
ffdb6fb159
org.el (org-cycle): Fix misplaced autoload cookie
...
* org.el (org-cycle): Fix misplaced autoload cookie.
2012-10-01 17:54:24 +02:00
1dd42283b7
org-agenda.el: Fix bug: do not bypass `org-agenda-timerange-leaders'
...
* org-agenda.el (org-agenda-get-timestamps): Check if the item
is an habit when formatting it with `org-agenda-format-item'.
(org-agenda-get-blocks): Fix bug: don't assume the item is an
habit when formatting with `org-agenda-format-item'.
Thanks to George McNinch for reporting this.
2012-10-01 17:53:39 +02:00
7f74da3f22
Merge branch 'maint'
2012-10-01 07:53:01 +02:00
1df9907b50
org-fixup.el: Use defvar instead of defconst to define the `org-odt-data-dir' autoload
...
* org-fixup.el (org-make-org-version): Use defvar instead of
defconst to define the `org-odt-data-dir' autoload.
Thanks to Glenn Morris for pointing at this.
2012-10-01 07:52:50 +02:00
934208ece1
org-element: Allow links in captions
...
* lisp/org-element.el (org-element-object-restrictions): Allow links
in caption. Also allow inline-src-blocks and inline-babel-calls.
* contrib/lisp/org-e-ascii.el (org-e-ascii--unique-links): Handle
links in captions.
(org-e-ascii--describe-links): Small refactoring.
(org-e-ascii-template--document-title): Handle links in document
properties.
2012-09-30 23:57:45 +02:00
3245619445
org-element: Allow to map over affiliated keywords
...
* lisp/org-element.el (org-element-map): Change signature.
* testing/lisp/test-org-element.el: Add test.
2012-09-30 23:57:45 +02:00
e74523905b
org-element: Distinguish parsed affiliated keywords from document properties
...
* lisp/org-element.el (org-element-parsed-keywords): Remove document
properties from the value.
(org-element-dual-keywords): Fix docstring.
(org-element-document-properties): New variable
* contrib/lisp/org-export.el (org-export--get-subtree-options,
org-export--get-inbuffer-options, org-export--get-global-options):
Use new variable instead of parsed keywords.
2012-09-30 23:57:45 +02:00
d79227cbd1
Merge branch 'maint'
2012-09-30 20:20:36 +02:00
f95e5ff1ba
Fix a bug, allow "i" in calendar (and remove "k" from calendar)
...
* org.el (org-calendar-agenda-action-key): Delete an option.
(org-mode-map): Delete its keybinding.
(org-agenda-action-marker, org-mark-entry-for-agenda-action):
Delete.
* org-agenda.el (org-agenda-diary-entry): Don't prevent from
being used outside of Org agendas, as it can be used in
calendar buffers too.
Note that we may have to reimplement the functions related to
"k" in the calendar.
2012-09-30 20:20:22 +02:00
e189be5720
org-export: Small refactoring
...
* contrib/lisp/org-export.el (org-export--get-buffer-attributes):
Small refactoring.
2012-09-30 14:03:37 +02:00
9f7fd9d2bb
Merge branch 'maint'
2012-09-30 13:38:07 +02:00
52df4aba9b
org-element: Fix 1ad58a8230
...
* lisp/org-element.el (org-element-paragraph-parser): Fix regexp
starting a block.
2012-09-30 13:36:44 +02:00
Bastien Guerry
Nicolas Goaziou