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
d6fb245590
Merge branch 'maint'
2012-09-30 13:13:21 +02:00
1ad58a8230
org-element: Use stricter regexps for boundaries of elements
...
* lisp/org-element.el (org-element-center-block-parser):
(org-element-drawer-parser, org-element-dynamic-block-parser,
org-element-example-block-parser, org-element-export-block-parser,
org-element-latex-environment-parser, org-element-paragraph-parser,
org-element-property-drawer-parser, org-element-src-block-parser,
org-element-verse-block-parser): Use stricter regexps for boundaries
of elements.
* testing/lisp/test-org.el: Fix a test.
2012-09-30 13:09:54 +02:00
de65b50612
Merge branch 'maint'
2012-09-30 09:24:16 +02:00
c8c8d0e2d9
org-agenda.el: Fix file permissions.
2012-09-30 09:24:12 +02:00
a4ee1466e9
Merge branch 'maint'
2012-09-30 08:47:26 +02:00
cde9275e51
ob-lilypond.el: Backport change by Paul Eggert in Emacs trunk
...
Don't use the abbreviation "win" to refer to Windows (Bug#10421).
* ob-lilypond.el (ly-w32-ly-path): Rename from ly-win32-ly-path.
(ly-w32-pdf-path): Rename from ly-win32-pdf-path.
(ly-w32-midi-path): Rename from ly-win32-midi-path.
(ly-determine-ly-path, ly-determine-pdf-path, ly-determine-midi-path):
Check for "windows-nt", not "win32", in system-type.
See http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=607bfb
2012-09-30 08:47:16 +02:00
4bb8819bfc
Merge branch 'maint'
2012-09-29 23:47:38 +02:00
f60955a21a
fix remote execution w/empty shebang header arg
...
Thanks to Nick Dokos for isolating this bug and suggesting this fix.
* lisp/ob-sh.el (org-babel-sh-evaluate): Don't could 0-length shebangs.
2012-09-29 23:47:24 +02:00
50caf97422
Merge branch 'master' of orgmode.org:org-mode
2012-09-29 23:46:30 +02:00
a5483f2d39
Merge branch 'maint'
2012-09-29 23:46:15 +02:00
c7ffcf9246
Uncomment :version "24.3" cookies.
...
* org.el (org-url-hexify-p, org-doi-server-url)
(org-latex-preview-ltxpng-directory, org-custom-properties)
(org-sparse-tree-default-date-type): Add :version "24.3".
* org-agenda.el (org-agenda-sticky)
(org-agenda-custom-commands-contexts): Ditto.
* org-capture.el (org-capture-bookmark)
(org-capture-templates-contexts)
(org-capture-use-agenda-date): Ditto.
* org-latex.el (org-export-latex-hyperref-options-format)
(org-export-latex-link-with-unknown-path-format): Ditto.
* org-id.el (org-id-link-to-org-use-id): Ditto.
* org-datetree.el (org-datetree-add-timestamp): Ditto.
2012-09-29 23:46:02 +02:00
dbd5a2188f
Update ORG-NEWS
2012-09-29 23:41:16 +02:00
86e515d7cc
fix remote execution w/empty shebang header arg
...
Thanks to Nick Dokos for isolating this bug and suggesting this fix.
* lisp/ob-sh.el (org-babel-sh-evaluate): Don't could 0-length shebangs.
2012-09-29 15:12:10 -06:00
871a041ab9
Merge branch 'maint'
2012-09-29 22:38:39 +02:00
d9e5aed2aa
org.el: Fall back in interactive prompt when `org-make-link-description-function' fails
...
* org.el (org-make-link-description-function): Enhance
docstring.
(org-insert-link): Fall back on interactive prompt when
`org-make-link-description-function' fails.
Thanks to Sylvain Rousseau for triggering this.
2012-09-29 22:38:26 +02:00
d52e988c36
Merge branch 'maint'
2012-09-29 16:35:05 +02:00
ead43c9807
Point to the Org ELPA page for instructions on installing through ELPA
...
Also some minor rephrasing.
2012-09-29 16:34:33 +02:00
7d8a0c48a3
Merge branch 'maint'
2012-09-29 13:46:40 +02:00
d7be8dfad2
Remove comment from previous commit.
2012-09-29 13:46:31 +02:00
Bastien Guerry
Nicolas Goaziou
Eric Schulte