9604f522fc
org-bbdb.el: Enhance a customization type and suppress (defvar name).
...
* org-bbdb.el (org-bbdb-anniversary-format-alist): Update the
customization type.
(name): Suppress (defvar 'name) as name is not eval'ed when
setting `org-bbdb-anniversary-format-alist'.
2012-04-29 17:00:16 +02:00
e3dfe717c8
org-export: Use (org-version) for creator string
...
* contrib/lisp/org-export.el (org-export-creator-string):
Use (org-version) for creator string.
2012-04-29 15:52:14 +02:00
6732d633af
Make (org-version) always returns a string, use it in exporters.
...
* org.el (org-version): When called non-interactively, insert
the short version string, otherwise send a message with the
complete version string.
* org-odt.el (org-odt-update-meta-file): Use (org-version) and
delegate checking whether `org-version' is known as a variable
there.
* org-html.el (org-export-as-html): Use (org-version).
* org-docbook.el (org-export-as-docbook): Ditto.
* org-latex.el (org-export-latex-make-header): Ditto.
2012-04-29 12:17:00 +02:00
d6e56bce71
org.texi: Document `C-0' as a prefix argument for `org-capture'.
...
* org.texi (Using capture): Document `C-0' as a prefix
argument for `org-capture'.
Thanks to Charles for this.
2012-04-29 10:58:36 +02:00
b5f4b526ca
org-element: Rename `time-stamp' object type into `timestamp'
2012-04-29 02:26:57 +02:00
941f90a649
org-export: Export `clock' and `planning' elements
...
* contrib/lisp/org-export.el (org-export-option-alist): Add new
filters.
(org-export-with-clocks, org-export-with-planning,
org-export-filter-clock-functions,
org-export-filter-planning-functions): New variables.
(org-export--skip-p): Skip `clock' and `planning' types depending on
export options.
* contrib/lisp/org-e-ascii.el (org-e-ascii-clock,
org-e-ascii-planning): New functions.
(org-e-ascii-time-stamp): Update function. Use `org-translate-time'.
* contrib/lisp/org-e-html.el (org-e-html-clock, org-e-html-planning):
New functions.
(org-e-html-time-stamp): Update function.
* contrib/lisp/org-e-latex.el (org-e-latex-clock,
org-e-latex-planning): New functions.
(org-e-latex-time-stamp): Update function. Use `org-translate-time'.
* contrib/lisp/org-e-odt.el (org-e-odt-clock, org-e-odt-planning): New
functions.
(org-e-odt-time-stamp): Update function. Use `org-translate-time'.
* testing/lisp/test-org-export.el: Add tests.
2012-04-29 02:26:33 +02:00
5cd9c01757
org-element: Add `clock' and `planning' element types
...
* contrib/lisp/org-element.el (org-element-babel-call-parser): Fix
property name.
(org-element-babel-call-interpreter, org-element--element-block-re):
Fix docstring.
(org-element-clock-parser, org-element-clock-interpreter,
org-element-planning-parser, org-element-planning-interpreter): New
functions.
(org-element-time-stamp-parser): Move planning keywords out of the
object: no more `:appt-type' property
(org-element-time-stamp-interpreter,
org-element-time-stamp-successor): Apply changes to previous function.
(org-element-paragraph-separate): Time keywords also end paragraphs.
(org-element-all-elements): Register new elements types.
(org-element-current-element): Recognize new elements.
(org-element-parse-elements): Fix comments.
* testing/lisp/test-org-element.el: Add tests.
2012-04-29 02:26:33 +02:00
4eb4010a97
Merge branch 'origin-maint'
...
Conflicts:
lisp/ob.el
2012-04-28 18:03:23 -04:00
c306dbe388
org-clock.el: Fix bug in `org-clocktable-write-default'.
...
* org-clock.el (org-clocktable-write-default): Temporarily
disable `delete-active-region' so that we don't accidently
delete an active region when exporting a subtree/region.
Thanks to Mike McLean for the detailed bug report.
2012-04-29 01:18:35 +02:00
604a55edd6
fixes a bug finding empty named results
...
* lisp/ob.el (org-babel-find-named-result): Fix bug finding empty
named results.
2012-04-28 18:02:13 -04:00
008689cc79
org-clock.el: Use `executable-find' instead of `org-program-exists'.
...
* org-clock.el (org-program-exists): Remove.
(org-show-notification, org-clock-play-sound): Use
`executable-find' instead of `org-program-exists'.
Thanks to Sébastien Vauban for pointing this.
2012-04-28 23:43:10 +02:00
0678e0e359
Merge branch 'master' of orgmode.org:org-mode
2012-04-28 23:35:01 +02:00
d7dfe9fd69
org-table.el: Fix `org-table-store-formulas'.
...
The bug was introduced by this commit:
http://orgmode.org/w/?p=org-mode.git;a=commit;h=1c203d
Thanks to Matt Lundin who reported this nasty/stupid bug.
2012-04-28 23:34:51 +02:00
f9d4069033
Merge branch 'maint'
2012-04-28 22:37:23 +02:00
7f2e22339c
Fix `org-planning-or-clock-line-re' regexp
...
* lisp/org.el (org-set-regexps-and-options): Fix
`org-planning-or-clock-line-re' regexp. Indeed "\\>" will never
match since time keywords must end with colons, which are not word
constituent.
2012-04-28 22:34:36 +02:00
7e155ecfbc
Merge branch 'master' of orgmode.org:org-mode
2012-04-28 22:24:32 +02:00
982b7b972f
Merge branch 'fix-org-diary-bug' into fix-compiler-warnings
2012-04-28 22:23:40 +02:00
4b8359a395
org-agenda.el: Prevent org-diary to fail.
...
* org-agenda.el (org-diary): Prevent failure from
`org-compile-prefix-format' when there is no agenda buffer.
Thanks to Rafael who reported this.
2012-04-28 22:23:08 +02:00
c5f73635d0
Replace obsolete variable `buffer-substring-filters'.
...
* org-agenda.el (org-agenda-mode): Replace obsolete variable
`buffer-substring-filters'.
* org-indent.el (org-indent-mode): Ditto.
2012-04-28 21:36:58 +02:00
3621634861
org-element: Fix code typo
...
* contrib/lisp/org-element.el (org-element-object-successor-alist):
Fix code typo.
2012-04-28 21:12:56 +02:00
fd5f561a3e
org-element: Fix block parsing
...
* contrib/lisp/org-element.el (org-element-current-element): Fix
regexp for block boundaries.
* testing/lisp/test-org-element.el (test-org-element/block-switches):
Fix test.
2012-04-28 21:12:30 +02:00
69d2d4e130
org-compat.el: Silent the byte-compiler about a warning related to XEmacs support.
...
* org-compat.el (org-find-library-name): Silent the
byte-compiler about a warning related to XEmacs support.
2012-04-28 19:16:59 +02:00
3d3ad17d74
org-special-blocks.el: `org-line' instead of `line'.
...
* org-special-blocks.el
(org-special-blocks-convert-html-special-cookies): Use
`org-line' instead of `line'.
2012-04-28 19:08:42 +02:00
b69eeee54d
org-html.el: Use `org-line' instead of `line' as the free variable name.
...
* org-html.el (org-html-handle-links, org-export-as-html)
(org-format-org-table-html, org-format-table-table-html)
(org-html-export-list-line): Use `org-line' instead of `line'
as the free variable name.
2012-04-28 19:06:52 +02:00
676846cd85
org-element: Don't forget to register new objects
...
* contrib/lisp/org-element.el (org-element-all-objects): Register new objects.
2012-04-28 19:01:25 +02:00
019bd93ced
org-latex.el (org-export-latex-tables): Let-bind `hfmt'.
...
* org-latex.el (org-export-latex-tables): Let-bind `hfmt'.
Silent byte-compiler.
2012-04-28 18:48:02 +02:00
f70afc42ef
org-export: Fix tests
...
* contrib/lisp/org-export.el (org-export-filters-alist): Remove
unexistant filters.
2012-04-28 18:08:37 +02:00
b21b6ead24
org-element: Define new objects (bold, code, italic, ...)
...
* contrib/lisp/org-e-ascii.el (org-e-ascii-option-alist): Fix typo.
(org-e-ascii-bold, org-e-ascii-code, org-e-ascii-strike-through,
org-e-ascii-underline): New functions.
(org-e-ascii-emphasis): Remove function.
* contrib/lisp/org-e-html.el (org-e-html-text-markup-alist): Variable
renamed from `org-e-html-emphasis-alist'. Change value type.
(org-e-html-bold, org-e-html-italic, org-e-html-strike-through,
org-e-html-underline): New functions.
(org-e-html-verbatim): Update function.
(org-e-html-emphasis): Remove function.
* contrib/lisp/org-e-latex.el (org-e-latex-text-markup-alist):
Variable renamed from `org-e-latex-emphasis-alist'. Change value
type.
(org-e-latex-center-block): Fix docstring.
(org-e-latex--text-markup, org-e-latex-bold, org-e-latex-code,
org-e-latex-italic, org-e-latex-strike-through,
org-e-latex-underline): New functions.
(org-e-latex-verbatim): Update function.
(org-e-latex-emphasis): Remove function.
* contrib/lisp/org-e-odt.el (org-e-odt-bold, org-e-odt-code,
org-e-odt-italic, org-e-odt-strike-through, org-e-odt-underline):
New functions.
(org-e-odt-verbatim): Update function.
(org-e-odt-center-block): Fix docstring.
(org-e-odt-emphasis): Remove function.
* contrib/lisp/org-element.el (org-element-bold-parser):
(org-element-bold-interpreter, org-element-code-parser,
org-element-code-interpreter, org-element-italic-parser,
org-element-italic-interpreter, org-element-strike-through-parser,
org-element-strike-through-interpreter, org-element-underline-parser,
org-element-underline-interpreter): New functions.
(org-element-emphasis-parser, org-element-emphasis-interpreter):
Remove functions.
(org-element-verbatim-parser, org-element-verbatim-interpreter,
org-element-text-markup-successor): Update function.
(org-element-object-successor-alist): Add associations for new object
types.
(org-element-recursive-objects): Add `bold', `italic',
`strike-through' and `underline' as recursive types.
(org-element-object-restrictions): Add restrictions for new recursive
object types.
* contrib/lisp/org-export.el (org-export-filters-alist): Add filters
for new object types.
(org-export-with-todo-keywords): Add missing keywords.
(org-export-filter-center-block-functions,
org-export-filter-drawer-functions,
org-export-filter-dynamic-block-functions,
org-export-filter-headline-functions,
org-export-filter-inlinetask-functions,
org-export-filter-plain-list-functions,
org-export-filter-item-functions, org-export-filter-comment-functions,
org-export-filter-comment-block-functions,
org-export-filter-example-block-functions,
org-export-filter-export-block-functions,
org-export-filter-fixed-width-functions,
org-export-filter-footnote-definition-functions,
org-export-filter-horizontal-rule-functions,
org-export-filter-keyword-functions,
org-export-filter-latex-environment-functions,
org-export-filter-babel-call-functions,
org-export-filter-paragraph-functions,
org-export-filter-property-drawer-functions,
org-export-filter-quote-section-functions,
org-export-filter-quote-block-functions,
org-export-filter-section-functions,
org-export-filter-special-block-functions,
org-export-filter-src-block-functions,
org-export-filter-table-functions,
org-export-filter-table-cell-functions,
org-export-filter-table-row-functions,
org-export-filter-verse-block-functions,
org-export-filter-entity-functions,
org-export-filter-export-snippet-functions,
org-export-filter-footnote-reference-functions,
org-export-filter-inline-babel-call-functions,
org-export-filter-inline-src-block-functions,
org-export-filter-latex-fragment-functions,
org-export-filter-line-break-functions,
org-export-filter-link-functions, org-export-filter-macro-functions,
org-export-filter-radio-target-functions,
org-export-filter-statistics-cookie-functions,
org-export-filter-subscript-functions,
org-export-filter-superscript-functions,
org-export-filter-target-functions,
org-export-filter-time-stamp-functions,
org-export-filter-verbatim-functions): Fix docstring.
(org-export-filter-bold-functions, org-export-filter-code-functions,
org-export-filter-italic-functions,
org-export-filter-strike-through-functions,
org-export-filter-underline-functions): New variables.
(org-export-filter-emphasis-functions): Remove variable.
* testing/lisp/test-org-element.el: Add tests.
2012-04-28 18:00:50 +02:00
312e225685
org-export: Remove unnecessary back-end arguments
...
* contrib/lisp/org-e-ascii.el (org-e-ascii--build-title,
org-e-ascii--build-caption, org-e-ascii--list-listings,
org-e-ascii--list-tables, org-e-ascii--describe-links,
org-e-ascii-template--document-title, org-e-ascii-dynamic-block,
org-e-ascii-inlinetask, org-e-ascii-item, org-e-ascii-link,
org-e-ascii-quote-section, org-e-ascii--table-cell-width): Do not
provide back-end symbol.
* contrib/lisp/org-e-html.el (org-e-html--caption/label-string,
org-e-html-footnote-section, org-e-html-template,
org-e-html-dynamic-block, org-e-html-format-headline--wrap,
org-e-html-headline, org-e-html-item, org-e-html-link,
org-e-html-time-stamp): Do not provide back-end symbol.
* contrib/lisp/org-e-latex.el (org-e-latex--caption/label-string,
org-e-latex-template, org-e-latex-dynamic-block,
org-e-latex-footnote-reference, org-e-latex-headline,
org-e-latex-inlinetask, org-e-latex-item, org-e-latex-link,
org-e-latex-src-block): Do not provide back-end symbol.
* contrib/lisp/org-e-odt.el (org-e-odt-format-preamble,
org-e-odt-format-label, org-e-odt-write-manifest-file,
org-e-odt--caption/label-string, org-e-odt-dynamic-block,
org-e-odt-format-headline--wrap, org-e-odt-headline, org-e-odt-item,
org-e-odt-latex-environment, org-e-odt-link, org-e-odt-src-block,
org-e-odt-time-stamp): Do not provide back-end symbol.
* contrib/lisp/org-export.el (org-export-get-environment): Provide
back-end symbol under `:back-end' property.
(org-export-collect-tree-properties, org-export-data,
org-export-filter-verbatim-functions, org-export-install-filters,
org-export-as, org-export-expand-macro,
org-export-filter-apply-functions, org-export-secondary-string):
Remove back-end references.
* testing/lisp/test-org-export.el: Update tests.
Back-end can be found in communication channel with (plist-get
info :back-end). Hence back-ends do not have to hard-code their name
in any transcoder. It will allow to derive a back-end from another
one.
2012-04-28 11:41:15 +02:00
b3e8a8d437
org-export: Run a hook before parsing
...
* contrib/lisp/org-export.el (org-export-before-parsing-hook): New
variable.
(org-export-as): Run `org-export-before-parsing-hook'.
* testing/lisp/test-org-export.el: Add test.
2012-04-28 09:35:12 +02:00
21e24f8f24
org.el: New face `org-list-dt' for definition terms in list.
...
* org-faces.el (org-list-dt): New face.
* org.el (org-set-font-lock-defaults): Use `org-list-dt' as
the face for definition terms in definition lists.
Thanks to Alex Lane for suggesting this.
2012-04-27 23:26:05 +02:00
30986cd7c5
org.el: Fix bug in `org-fill-paragraph'.
...
* org.el (org-fill-paragraph): Pass the `justify' argument to
`org-fill-paragraph-fallback-function'.
Thanks to Nick Dokos for spotting this.
2012-04-27 23:08:56 +02:00
41b2a2e766
org-element: Add tests
2012-04-27 19:02:02 +02:00
8e52d1d7f0
org-element: Fix comment block interpreter
...
* contrib/lisp/org-element.el (org-element-comment-block-interpreter):
Fix comment block interpreter.
2012-04-27 17:27:28 +02:00
7cdd0db287
org-element: Fix headline/inlinetask interpretation
...
* contrib/lisp/org-element.el (org-element-inlinetask-interpreter,
org-element-headline-interpreter): Fix headline/inlinetask
interpretation.
(org-element-inlinetask-interpreter): Prefer degenerate inlinetasks
when they have no contents.
2012-04-27 17:16:32 +02:00
e4852f7ee9
org-element: Fix dynamic block parsing and interpretation
2012-04-27 17:16:32 +02:00
18aef0875a
org-element: Fix docstrings
2012-04-27 17:16:32 +02:00
0233eb989b
Merge branch 'maint'
2012-04-26 22:43:36 +02:00
0945fea562
org-ctags.el: Fix an option default value back again.
...
* org-ctags.el (org-ctags-new-topic-template): Fix the option
default value back again.
This option was "fixed" in Emacs emacs-24 branch:
http://git.savannah.gnu.org/cgit/emacs.git/diff/lisp/org/org-protocol.el?h=emacs-24&id=0fc749f9
During an Emacs merge, I didn't check carefully and backported
this change into Org maint branch. This is now fixed in Org and
in emacs-24.
2012-04-26 22:42:45 +02:00
8c18495597
Merge branch 'origin-maint'
2012-04-26 12:53:31 -04:00
b2fa4cbbbf
etc/ORG-NEWS: add license and some more information.
2012-04-26 19:01:29 +02:00
5d5ce5d7b0
don't rely on kill-new to return a string
...
* lisp/org-bibtex.el (org-bibtex-export-to-kill-ring): Don't rely on
kill-new to return a string.
2012-04-26 12:51:36 -04:00
fa7c989a3f
remove call to bibtex-reformat which often hangs
...
* lisp/org-bibtex.el (org-bibtex-headline): Remove call to
bibtex-reformat which often hangs.
2012-04-26 12:50:16 -04:00
a1a5c15e7e
etc/ORG-NEWS: Major rewriting.
2012-04-26 18:48:56 +02:00
580add2f41
org.el (org-eval-in-calendar): Fix docstring to mention the KEEPDATE parameter.
...
* org.el (org-eval-in-calendar): Fix docstring to mention the
KEEPDATE parameter.
Thanks to Toby Cubitt for spotting this.
2012-04-26 15:41:09 +02:00
dd6ee0e1b5
Merge branch 'master' of orgmode.org:org-mode
2012-04-26 15:16:05 +02:00
fe0515e5bf
org.el (org-refresh-category-properties): Let-bind `inhibit-read-only' to t.
...
* org.el (org-refresh-category-properties): Let-bind
`inhibit-read-only' to t.
2012-04-26 14:56:31 +02:00
c6dc6e3d32
org-element: Verse blocks now contain objects
...
* contrib/lisp/org-element.el (org-element-verse-block-parser): Verse
blocks now contain objects.
(org-element-verse-block-interpreter, org-element-current-element):
Apply changes to verse blocks.
(org-element-secondary-value-alist): Remove verse blocks from elements
with a secondary string.
* contrib/lisp/org-e-odt.el (org-e-odt-verse-block): Apply changes to
verse blocks.
* contrib/lisp/org-e-latex.el (org-e-latex-verse-block): Apply changes
to verse blocks.
* contrib/lisp/org-e-html.el (org-e-html-verse-block): Apply changes
to verse blocks.
* contrib/lisp/org-e-ascii.el (org-e-ascii-verse-block): Apply changes
to verse blocks.
* testing/lisp/test-org-element.el: Add tests.
2012-04-26 14:49:29 +02:00
c3d7d21108
org-e-latex: Fix coderef display for links with no contents
...
* contrib/lisp/org-e-latex.el (org-e-latex-link): Fix coderef display
for links with no contents.
* contrib/lisp/org-e-odt.el (org-e-odt-link): Remove useless test.
* contrib/lisp/org-e-html.el (org-e-html-link): Remove useless test.
2012-04-26 14:49:29 +02:00
206ce6e0b5
org-element: Ignore blank lines when removing element indentation
...
* contrib/lisp/org-element.el (org-element-normalize-contents): Ignore
blank and empty lines when removing element indentation.
* testing/lisp/test-org-element.el: Add tests.
2012-04-26 14:49:29 +02:00
Bastien Guerry
Nicolas Goaziou
Eric Schulte