41 min agoMerge branch 'maint' master
Achim Gratz [Tue, 29 Jul 2014 20:12:22 +0000]
Merge branch 'maint'

42 min agomk/ consider only release_* tags for constructing version strings maint
Achim Gratz [Wed, 2 Jul 2014 18:32:24 +0000]
mk/ consider only release_* tags for constructing version strings

Cherry-picked from d1692902f1, which was dropped by force-pushing 79873390ed.

58 min agoFix 1f3fefcba5
Achim Gratz [Tue, 29 Jul 2014 19:55:47 +0000]
Fix 1f3fefcba5

* testing/lisp/test-org.el: The title of the Emacs manual is "The Emacs Editor".

78 min agoFix 600d3bb56b
Achim Gratz [Tue, 29 Jul 2014 19:35:43 +0000]
Fix 600d3bb56b

* lisp/org-table.el: The reference has been saved in `formrpl', not

7 hours agoORG-NEWS: Deprecate `org-list-empty-line-terminates-plain-lists'
Nicolas Goaziou [Tue, 29 Jul 2014 13:49:11 +0000]
ORG-NEWS: Deprecate `org-list-empty-line-terminates-plain-lists'

7 hours agoORG-NEWS: Document changes relative to publishing options
Nicolas Goaziou [Tue, 29 Jul 2014 12:56:03 +0000]
ORG-NEWS: Document changes relative to publishing options

7 hours agoox-html: Use options instead of hard-coded variables
Nicolas Goaziou [Tue, 29 Jul 2014 12:42:15 +0000]
ox-html: Use options instead of hard-coded variables

* contrib/lisp/ox-s5.el (org-s5--format-toc-headline): Apply signature

* lisp/ox-md.el (org-md-headline): Apply signature change.

* lisp/ox-html.el (org-html-format-drawer-function,
  org-html-publish-to-html): Small reformatting.

(org-html-infojs-install-script, org-html--build-meta-info,
org-html--build-mathjax-config, org-html-format-spec,
org-html--build-pre/postamble, org-html-template, org-html-toc,
org-html--format-toc-headline, org-html-list-of-listings,
org-html-list-of-tables, org-html-bold, org-html-drawer,
org-html-headline, org-html-inlinetask, org-html-italic,
org-html-checkbox, org-html-inline-image-p, org-html-link,
org-html-section, org-html-strike-through, org-html-table-cell,
org-html-table-row, org-html-underline, org-html-verbatim,
org-html-final-function, org-html-export-to-html): Do not use
hard-coded variable names.

org-html-format-inlinetask-function): Change default value.  Require
an additional argument.

org-html-format-footnote-definition, org-html-format-headline,
org-html-format-headline--wrap, org-html-format-section): Remove

(org-html-footnote-section, org-html-footnote-reference): Apply
function removal.  Do not use hard-coded variable names.

(org-html--anchor, org-html--todo, org-html--tags): Change signature.
Do not use hard-coded variable names.

(org-html-radio-target, org-html-target): Apply signature change.

org-html-format-inlinetask-default-function): New functions.

7 hours agoox-odt: Use options instead of hard-coded variables
Nicolas Goaziou [Mon, 28 Jul 2014 15:24:40 +0000]
ox-odt: Use options instead of hard-coded variables

* lisp/ox-odt.el (org-odt-styles-dir,
  org-odt-create-custom-styles-for-srcblocks, org-odt-table-styles,
  org-odt-get-table-cell-styles): Fix docstring.
org-odt-format-inlinetask-function): Change default value.

(org-odt-template, org-odt-drawer, org-odt-format-headline--wrap,
org-odt-inlinetask, org-odt--enumerate, org-odt--image-size,
org-odt--enumerable-image-p, org-odt--enumerable-latex-image-p,
org-odt--enumerable-formula-p, org-odt-link, org-odt-table-style-spec,
org-odt-timestamp): Use option instead of hard-coded variables.

(org-odt-format-headline): Remove function.

(org-odt-do-format-code): Change signature.  Use options instead of
hard-coded variables.
(org-odt-fixed-width, org-odt-latex-environment,
org-odt-link--inline-image, org-odt-format-code): Apply signature

org-odt-format-inlinetask-default-function): New functions.

(org-odt-link--inline-image): Fix indentation.

7 hours agoUse options instead of hard-coded variables
Nicolas Goaziou [Mon, 28 Jul 2014 13:44:56 +0000]
Use options instead of hard-coded variables

* lisp/ox-beamer.el (org-beamer--format-frame,
  org-beamer--format-block, org-beamer-template): Use options instead
  of hard-coded variables.

* lisp/ox-man.el (org-man-inline-src-block, org-man-src-block,
  org-man-table, org-man-table-cell): Use options instead of
  hard-coded variables.

* lisp/ox-md.el (org-md-headline): Use options instead of hard-coded

* lisp/ox-texinfo.el (org-texinfo-format-headline-function,
  org-texinfo-format-inlinetask-function): Change default value.
(org-texinfo--text-markup, org-texinfo--format-menu): Change signature
(org-texinfo--build-menu, org-texinfo-bold, org-texinfo-code,
org-texinfo-comment, org-texinfo-italic, org-texinfo-verbatim): Apply
signature change.

(org-texinfo-template, org-texinfo-clock, org-texinfo-drawer,
org-texinfo-link, org-texinfo-plain-list, org-texinfo-planning,
org-texinfo-table, org-texinfo-table-cell, org-texinfo-timestamp): Use
options instead of variable names.

org-texinfo-format-inlinetask-default-function): New functions.
(org-texinfo-headline, org-texinfo-inlinetask): Use new functions.

7 hours agoRemove some options associated to variables
Nicolas Goaziou [Mon, 28 Jul 2014 13:14:53 +0000]
Remove some options associated to variables

* lisp/ox-html.el: Remove options.

* lisp/ox-icalendar.el: Remove options.

* lisp/ox-latex.el (org-latex-guess-inputenc, org-latex-compile,
  org-latex--collect-warnings): Use full variable name instead of an

* lisp/ox-man.el: Remove options.

* lisp/ox-odt.el: Remove options.

* lisp/ox-texinfo.el: Remove options.

* doc/org.texi (Publishing options): Update documentation accordingly.

These variables are meant to be used outside (or on the fringe) of the
export process, where information channel is not available.


7 hours agoox-latex: Use options instead of hard-coded variables
Nicolas Goaziou [Mon, 28 Jul 2014 12:51:08 +0000]
ox-latex: Use options instead of hard-coded variables

* lisp/ox-latex.el (org-latex-format-inlinetask-function): Change
  default value.
(org-latex-guess-inputenc, org-latex--text-markup, org-latex-template,
org-latex-clock, org-latex-drawer, org-latex-footnote-reference,
org-latex-headline, org-latex-inline-src-block, org-latex-keyword,
org-latex--inline-image, org-latex-link, org-latex-planning,
org-latex-src-block, org-latex-table, org-latex--org-table,
org-latex--table, org-latex--math-table, org-latex-table-cell,
org-latex-table-row, org-latex-timestamp, org-latex-compile,
org-latex--collect-warnings): Use options instead of hard-coded

(org-latex-format-inlinetask-default-function): New function.
(org-latex-inlinetask): Use new function.

(org-latex--text-markup): Change signature.
(org-latex-bold, org-latex-code, org-latex-italic,
org-latex-strike-through, org-latex-underline, org-latex-verbatim):
Apply signature change.

7 hours agoorg.el (org-yank): Small docstring enhancement
Bastien Guerry [Tue, 29 Jul 2014 13:35:39 +0000]
org.el (org-yank): Small docstring enhancement

* org.el (org-yank): Small docstring enhancement.

7 hours agoorg.el (org-refresh-category-properties): Regexp enhancement
Malcolm Purvis [Tue, 29 Jul 2014 13:22:54 +0000]
org.el (org-refresh-category-properties): Regexp enhancement

* org.el (org-refresh-category-properties): Regexp enhancement.


7 hours agoMerge branch 'maint'
Bastien Guerry [Tue, 29 Jul 2014 13:21:31 +0000]
Merge branch 'maint'

7 hours agoRemove unnecessary invocations of org-mode
Matt Lundin [Tue, 29 Jul 2014 04:56:42 +0000]
Remove unnecessary invocations of org-mode

* lisp/ox-publish.el: (org-publish-find-title) (org-publish-find-date)
  Fix unnecessary invocations of org-mode with

The functions above call org-mode with org-inhibit-startup in org
buffers that are already open. The result is that these open buffers
lose some crucial local variables during publishing. For instance,
an open buffer will lose its dir-local-variables-alist setting
during publishing. There is no need to call org-mode here, because
org-mode is a) either already initialized in the buffer or b)
initialized via earlier call to find-file-no-select.

This looks to me like a relic of some past time when these functions were
called in temporary buffers that contained copies of the file's contents.

27 hours agoMerge branch 'maint'
Bastien Guerry [Mon, 28 Jul 2014 17:23:04 +0000]
Merge branch 'maint'

27 hours agoorg-agenda.el (org-agenda-prepare): Reset preset filters
Bastien Guerry [Mon, 28 Jul 2014 17:22:53 +0000]
org-agenda.el (org-agenda-prepare): Reset preset filters

* org-agenda.el (org-agenda-prepare): Reset preset filters
when using sticky agendas.

Thanks to Thomas Morgan for reporting this.

27 hours agoDon't use an overlay for src blocks backgrounds
Bastien Guerry [Mon, 28 Jul 2014 16:54:00 +0000]
Don't use an overlay for src blocks backgrounds

* org-faces.el (org-block-background): Delete.

* org.el (org-fontify-meta-lines-and-blocks-1): Don't use an
overlay for the block background.
(org-in-src-block-p): Check against the `src-block' text
property, not against an overlay.

The overlay was introduced here:
and fixed here

But (1) it makes fontification slowler, (2) it makes
`org-in-src-block-p' slower and it prevents correct ps-printing
of Org buffers.

If we want to use a different background color, we need another
solution than using overlays.

28 hours agoRemove useless declaration
Bastien Guerry [Mon, 28 Jul 2014 16:29:24 +0000]
Remove useless declaration

28 hours agoMerge branch 'maint'
Bastien Guerry [Mon, 28 Jul 2014 16:22:29 +0000]
Merge branch 'maint'


28 hours agoorg-agenda.el (org-agenda-get-sexps): Don't add tags as text properties
Bastien Guerry [Mon, 28 Jul 2014 16:21:58 +0000]
org-agenda.el (org-agenda-get-sexps): Don't add tags as text properties

* org-agenda.el (org-agenda-get-sexps): Don't add tags as text

Thanks to Raimund Berger for reporting this.

28 hours agoMerge branch 'maint'
Bastien Guerry [Mon, 28 Jul 2014 16:08:44 +0000]
Merge branch 'maint'

28 hours agoorg-capture.el (org-capture-fill-template): Small fix
Bastien Guerry [Mon, 28 Jul 2014 16:08:34 +0000]
org-capture.el (org-capture-fill-template): Small fix

* org-capture.el (org-capture-fill-template): Take
`org-extend-today-until' into account when setting the format
time string.

29 hours agoorg-clock.el: Various improvements
Bastien Guerry [Mon, 28 Jul 2014 15:43:15 +0000]
org-clock.el: Various improvements

* org-clock.el (org-clock-display-default-range): New option.
(org-clock-display): Use the new option.
(org-clock-sum-custom): New parameters `range' and `propname'.
(org-clock-special-range): Allow to enter a special range
through the calendar.

29 hours agoorg.el (org-self-insert-command): Use `yas-expand'
Bastien Guerry [Mon, 28 Jul 2014 15:28:54 +0000]
org.el (org-self-insert-command): Use `yas-expand'

* org.el (org-self-insert-command): Use `yas-expand' as
yas/expand is obsolete since Yasnippet 0.8.

Thanks to Craig Tanis for reporting this.

30 hours agoorg-agenda.el (org-agenda-insert-diary-make-new-entry): Fix ordering
Nikolai Weibull [Mon, 28 Jul 2014 14:22:04 +0000]
org-agenda.el (org-agenda-insert-diary-make-new-entry): Fix ordering

* org-agenda.el (org-agenda-insert-diary-make-new-entry):
Fix ordering.


30 hours agoMake org-get-limited-outline-regexp usable outside of org.
Nicolas Richard [Tue, 22 Jul 2014 16:29:00 +0000]
Make org-get-limited-outline-regexp usable outside of org.

This allows org-narrow-to-subtree to function in Outline mode.

* lisp/org-macs.el (org-get-limited-outline-regexp): Use
  outline-regexp instead of org-outline-regexp when not in Org mode.

30 hours agoorg.el (org-set-font-lock-defaults): Highlight COMMENT
Bastien Guerry [Mon, 28 Jul 2014 14:03:05 +0000]
org.el (org-set-font-lock-defaults): Highlight COMMENT

* org.el (org-set-font-lock-defaults): Highlight COMMENT in
headlines with `org-special-keyword'.

30 hours agoorg.el (org-comment-dwim): Fix docstring location
Bastien Guerry [Mon, 28 Jul 2014 14:00:23 +0000]
org.el (org-comment-dwim): Fix docstring location

* org.el (org-comment-dwim): Fix docstring location.

31 hours agoMerge branch 'master' of
Bastien Guerry [Mon, 28 Jul 2014 13:41:14 +0000]
Merge branch 'master' of

31 hours agoorg.el (org-open-at-point): Also open links in comment blocks
Bastien Guerry [Mon, 28 Jul 2014 13:40:49 +0000]
org.el (org-open-at-point): Also open links in comment blocks

* org.el (org-open-at-point): Also open links in comment blocks.

31 hours agoMerge branch 'maint'
Nicolas Goaziou [Mon, 28 Jul 2014 13:27:02 +0000]
Merge branch 'maint'

31 hours agoox-latex: Fix defcustoms
Nicolas Goaziou [Mon, 28 Jul 2014 13:25:50 +0000]
ox-latex: Fix defcustoms

* lisp/ox-latex.el (org-latex-table-scientific-notation): Set
  appropriate value.
(org-latex-listings-options): Fix docstring.

35 hours agoox-html.el (org-html-fontify-code): Possibly deactivate fci-mode
Bastien Guerry [Mon, 28 Jul 2014 09:07:03 +0000]
ox-html.el (org-html-fontify-code): Possibly deactivate fci-mode

* ox-html.el (org-html-fontify-code): Possibly deactivate fci-mode.

Thanks to Kaushal for suggesting this.

45 hours agoComplete commit 9e006d11
Bastien Guerry [Sun, 27 Jul 2014 23:24:56 +0000]
Complete commit 9e006d11

* org.el (org-preview-latex-fragment): Remove LaTeX fragments
overlays when they are displayed.  Fix message.

45 hours agoMerge branch 'maint'
Bastien Guerry [Sun, 27 Jul 2014 23:03:03 +0000]
Merge branch 'maint'

45 hours agoorg.el (org-paste-subtree): Fix match subexpression
Bastien Guerry [Sun, 27 Jul 2014 23:02:50 +0000]
org.el (org-paste-subtree): Fix match subexpression

* org.el (org-paste-subtree): Fix match subexpression.

Thanks to Anders Johansson for reporting this.

46 hours agoorg-refile: Don't copy the refiled subtree to the clipboard
Bastien Guerry [Sun, 27 Jul 2014 22:49:01 +0000]
org-refile: Don't copy the refiled subtree to the clipboard

* org.el (org-paste-subtree): New parameter `remove', to
remove the pasted subtree from the `kill-ring'.
(org-refile): Use the new parameter of `org-paste-subtree'.

Thanks to Samuel Wales for suggesting this.

46 hours agoorg-src.el (org-src-font-lock-fontify-block): Do not use `font-lock-ensure'
Bastien Guerry [Sun, 27 Jul 2014 22:34:55 +0000]
org-src.el (org-src-font-lock-fontify-block): Do not use `font-lock-ensure'

* org-src.el (org-src-font-lock-fontify-block): Use
`font-lock-fontify-buffer' instead of `font-lock-ensure',
otherwise fonts are not displayed for src blocks.

Thanks to Mathäus Meyer for reporting this.

46 hours agoFix trailing whitespace in previous commit
Bastien Guerry [Sun, 27 Jul 2014 22:01:23 +0000]
Fix trailing whitespace in previous commit

46 hours agoMake transfer of values from R type aware
Rainer M. Krug [Mon, 23 Jun 2014 10:11:59 +0000]
Make transfer of values from R type aware

* lisp/ob-R.el (org-babel-R-assign-elisp): Add different cases for
transfering integer, float, string and other variables to R so that
integer values are transferred as integers (L) and stored in R as
such.  This change is backward compatible as integer values are
numerical values in R.

Moved definition of R functions for transfer of tables into defconst
ob-R-transfer-variable-table-with-header and

46 hours agolisp/ob-R.el: Fix tangling with tables
Rainer M. Krug [Fri, 20 Jun 2014 20:19:59 +0000]
lisp/ob-R.el: Fix tangling with tables

* lisp/ob-R.el (org-babel-R-assign-elisp): Fix variable transfer of
tables by using text connections in R instead of files.  Variable
transfer of tables does not depend on files anymore, i.e. works also
when tangling.

47 hours agoob-core.el (org-babel-insert-header-arg): Tiny message fix
Bastien Guerry [Sun, 27 Jul 2014 21:25:41 +0000]
ob-core.el (org-babel-insert-header-arg): Tiny message fix

* ob-core.el (org-babel-insert-header-arg): Tiny message fix.

2 days agoMerge branch 'maint'
Bastien Guerry [Sun, 27 Jul 2014 18:19:46 +0000]
Merge branch 'maint'

2 days agoorg.texi (Key bindings and useful functions): Fix typos
Bastien Guerry [Sun, 27 Jul 2014 18:19:18 +0000]
org.texi (Key bindings and useful functions): Fix typos

* org.texi (Key bindings and useful functions): Fix typo.  Use
the correct function's name.

Thanks to Marco Wahl for the suggested fix.

2 days agoox-html.el (org-html-protect-char-alist): Make a defvar
Bastien Guerry [Sun, 27 Jul 2014 17:55:49 +0000]
ox-html.el (org-html-protect-char-alist): Make a defvar

* ox-html.el (org-html-protect-char-alist): Make a defvar.

2 days agoorg.el (org-ctrl-c-ctrl-c): Don't remove LaTeX fragments overlays
Bastien Guerry [Sun, 27 Jul 2014 17:44:40 +0000]
org.el (org-ctrl-c-ctrl-c): Don't remove LaTeX fragments overlays

* org.el (org-ctrl-c-ctrl-c): Don't remove LaTeX fragments overlays.

2 days agoFix trailing whitespaces from previous patch
Bastien Guerry [Sun, 27 Jul 2014 15:02:50 +0000]
Fix trailing whitespaces from previous patch

2 days agoTaskjuggler: Add valid project attributes [Wed, 25 Jun 2014 14:27:42 +0000]
Taskjuggler: Add valid project attributes

* ox-taskjuggler.el (org-taskjuggler--build-project): Insert all
   valid attributes from project.

* ox-taskjuggler.el (org-taskjuggler--build-attributes): Add project
  as possible ITEM to docstring.

* ox-taskjuggler.el (org-taskjuggler-valid-project-attributes): New

As reported by Nick Garber, project attributes like 'timingresolution'
could not be changed via Org-mode properties. This patch makes the
exporter treat project-attributes just like it treats task-, resource-
and report-attributes.

2 days agoox-latex.el (org-latex-listings-langs): Add `(makefile "make")'
Rainer M. Krug [Wed, 9 Jul 2014 07:31:42 +0000]
ox-latex.el (org-latex-listings-langs): Add `(makefile "make")'

* ox-latex.el (org-latex-listings-langs): Add `(makefile "make")'.

2 days agoorg-git-link.el: Add support for line in org-git-ling
Konubinix [Fri, 11 Jul 2014 07:10:02 +0000]
org-git-link.el: Add support for line in org-git-ling

* org-git-link.el (org-git-open): Jump to the line if provided in the link.
(org-git-split-string): Parse a third element of the list and change the error
message accordingly.
(org-git-create-git-link): Accept the third optional line argument.
(org-git-store-link): call `org-git-create-git-link' with the current line

2 days agoorg.el (org-activate-plain-links): Don't activate :elisp: and :shell: tags
Bastien Guerry [Sun, 27 Jul 2014 13:58:13 +0000]
org.el (org-activate-plain-links): Don't activate :elisp: and :shell: tags

* org.el (org-activate-plain-links): Don't activate :elisp:
and :shell: tags as links.  Enhance the docstring.
(org-activate-angle-links, org-activate-footnote-links)
(org-activate-bracket-links, org-activate-dates)
(org-activate-target-links): Minor docstrings enhancement.

Thanks to Andrea Rossetti for reporting this.

2 days agotest-org.el: Test info link using Emacs info documentation
Bastien Guerry [Sun, 27 Jul 2014 13:42:28 +0000]
test-org.el: Test info link using Emacs info documentation

* test-org.el (test-org/open-at-point-in-property)
(test-org/open-at-point/info): Test info link using Emacs info

2 days agocontrib/lisp/org-notmuch.el: new notmuch open function
Suvayu Ali [Wed, 16 Jul 2014 16:17:56 +0000]
contrib/lisp/org-notmuch.el: new notmuch open function

* contrib/lisp/org-notmuch.el: org-notmuch-tree-follow-link: New function,
  can be used to follow notmuch or notmuch-search links.

2 days agocontrib/lisp/org-notmuch.el: customisable notmuch open functions
Suvayu Ali [Wed, 16 Jul 2014 16:08:36 +0000]
contrib/lisp/org-notmuch.el: customisable notmuch open functions

* contrib/lisp/org-notmuch.el: org-notmuch-open-function,
  org-notmuch-open-search-function: New defcustoms, can be used to set
  custom notmuch-open functions.

2 days agoorg-table.el (org-table-eval-formula): Better error throwing
Bastien Guerry [Sun, 27 Jul 2014 13:05:48 +0000]
org-table.el (org-table-eval-formula): Better error throwing

* org-table.el (org-table-eval-formula): Throw an error when
trying to replace a wrong formula specifier.

Thanks to Alejandro Suarez for reporting this.

2 days agoORG-NEWS: Drop a note about backward-compatibility
Nicolas Goaziou [Sun, 27 Jul 2014 12:34:01 +0000]
ORG-NEWS: Drop a note about backward-compatibility

2 days agoORG-NEWS: Document `export-block' type removal
Nicolas Goaziou [Sat, 26 Jul 2014 20:40:57 +0000]
ORG-NEWS: Document `export-block' type removal

2 days agoMerge export and special blocks within back-ends
Nicolas Goaziou [Sat, 26 Jul 2014 20:08:38 +0000]
Merge export and special blocks within back-ends

* lisp/ox-ascii.el (org-ascii-export-block): Remove function.
(org-ascii-special-block): Handle raw special blocks.

* lisp/ox-beamer.el (org-beamer-export-block): Remove function.

* lisp/ox-html.el (org-html-export-block): Remove function.
(org-html-special-block): Handle raw special blocks.

* lisp/ox-latex.el (org-latex-export-block): Remove function.
(org-latex-special-block): Handle raw special blocks.

* lisp/ox-man.el (org-man-export-block): Remove function.
(org-man-special-block): Handle raw special blocks.

* lisp/ox-md.el (org-md-export-block): Remove function.

* lisp/ox-odt.el (org-odt-export-block): Remove function.
(org-odt-special-block): Handle raw special blocks.

* lisp/ox-texinfo.el (org-texinfo-export-block): Remove function.
(org-texinfo-special-block): Handle raw special blocks.

* contrib/lisp/ox-groff.el (org-groff-export-block): Remove function.
(org-groff-special-block): Handle raw special blocks.

* contrib/lisp/ox-koma-letter.el (org-koma-letter-export-block):
  Remove function.

2 days agoRemove `export-block' syntax type
Nicolas Goaziou [Sat, 26 Jul 2014 15:42:07 +0000]
Remove `export-block' syntax type

* lisp/org-element.el (org-element-all-elements): Remove
  `export-block' type.
(org-element-block-name-alist): Make it a defconst since it is not
meant to be changed anymore.
org-element-export-block-interpreter): Remove functions.

* lisp/ox.el (org-export-filters-alist): Remove export block filter.
(org-export-register-backend): Do not alter
`org-export-block-name-alist' anymore.
(org-export-define-backend, org-export-define-derived-backend): Update
(org-export-filter-export-block-functions): Remove variable.

* testing/lisp/test-org-element.el (test-org-element/export-block-parser,
  test-org-element/export-block-interpreter): Remove tests.

* testing/lisp/test-ox.el (test-org-export/define-backend): Update test.

2 days agoorg-element: Add `:raw-value' property to special blocks
Nicolas Goaziou [Sat, 26 Jul 2014 14:15:15 +0000]
org-element: Add `:raw-value' property to special blocks

* lisp/org-element.el (org-element-special-block-parser): Add
  `:raw-value' property.

2 days agoMerge branch 'maint'
Nicolas Goaziou [Sun, 27 Jul 2014 12:28:53 +0000]
Merge branch 'maint'

2 days agoox: Implement predicate for export blocks
Nicolas Goaziou [Sat, 26 Jul 2014 15:18:10 +0000]
ox: Implement predicate for export blocks

* lisp/ox.el (org-export-raw-special-block-p): New function.

* testing/lisp/test-ox.el (test-org-export/raw-special-block-p): New

This patch is a forward-compatibility measure since the function is
mandatory for export back-ends in Org 8.3. It makes it easier for
back-end maintainers to provide a back-end compatible with both Org
8.2 and 8.3.

2 days agotesting/README: Changes to "Interactive testing"
Rasmus [Fri, 18 Jul 2014 15:19:01 +0000]
testing/README: Changes to "Interactive testing"

* testing/README: Changes in "Interactive testing" instructions.

2 days agoMerge branch 'master' of
Bastien Guerry [Sun, 27 Jul 2014 08:53:24 +0000]
Merge branch 'master' of

3 days agoFix ID generation in org-rss-publish-to-rss
Matt Lundin [Wed, 23 Jul 2014 19:18:06 +0000]
Fix ID generation in org-rss-publish-to-rss

* contrib/lisp/ox-rss.el (org-rss-publish-to-rss): Fix a bug that
  causes ID properties to be generated in org buffer emacs is
  currently visiting rather than the file containing the feed.

3 days agotest-org-element: Fix indentation
Nicolas Goaziou [Sat, 26 Jul 2014 13:11:38 +0000]
test-org-element: Fix indentation

* testing/lisp/test-org-element.el (test-org-element/link-parser): Fix

3 days agoMerge branch 'maint'
Nicolas Goaziou [Sat, 26 Jul 2014 13:10:22 +0000]
Merge branch 'maint'


3 days agoorg-element: Fix parsing multi-line links
Nicolas Goaziou [Sat, 26 Jul 2014 08:47:29 +0000]
org-element: Fix parsing multi-line links

* lisp/org-element.el (org-element-link-parser): Properly handle
  multi-line links according to RFC 3986 when enclosed within square

* testing/lisp/test-org-element.el (test-org-element/link-parser): Add

3 days agocontrib/lisp/org-contacts.el: Allow the user to customize interactively the vcard...
Grégoire Jadi [Sat, 26 Jul 2014 04:15:30 +0000]
contrib/lisp/org-contacts.el: Allow the user to customize interactively the vcard export

* contrib/lisp/org-contacts.el (org-contacts-export-as-vcard): Wrap
  `org-contacts-export-as-vcard-internal' to prompt for the parameters
  when called interactively.
(org-contacts-export-as-vcard-internal): The old function

Thanks to Esben Stien for the suggestion.

4 days agoORG-NEWS: Add entries
Nicolas Goaziou [Mon, 30 Jun 2014 23:10:21 +0000]
ORG-NEWS: Add entries

4 days agoorg-element: Update regexps
Nicolas Goaziou [Fri, 25 Jul 2014 18:37:37 +0000]
org-element: Update regexps

* lisp/org-element.el (org-element--cache-sensitive-re): Update

4 days agoMerge branch 'maint'
Nicolas Goaziou [Fri, 25 Jul 2014 13:24:45 +0000]
Merge branch 'maint'

4 days agoorg-element: Fix object parsing in captions
Nicolas Goaziou [Fri, 25 Jul 2014 12:47:38 +0000]
org-element: Fix object parsing in captions

* lisp/org-element.el (org-element-parse-secondary-string): Clone all
  local variables from current buffer before parsing a secondary
  string.  Small refactoring.
(org-element-object-variables): Remove variable.

* testing/lisp/test-org-element.el (test-org-element/secondary-string-parsing):
  Add test.

Thanks to Thomas S. Dye for reporting it.

4 days agoox-ascii: Fix line break preservation
Nicolas Goaziou [Fri, 25 Jul 2014 12:03:26 +0000]
ox-ascii: Fix line break preservation

* lisp/ox-ascii.el (org-ascii--justify-element): Fix line break

Thanks to Miguel Ruiz for reporting it.

4 days agoox-ascii: Use options instead of defcustoms in code
Nicolas Goaziou [Fri, 25 Jul 2014 11:48:28 +0000]
ox-ascii: Use options instead of defcustoms in code

* lisp/ox-ascii.el (org-ascii--current-text-width,
  org-ascii--build-title, org-ascii--build-toc,
  org-ascii--list-listings, org-ascii--list-tables,
  org-ascii-template--document-title, org-ascii-inner-template,
  org-ascii-template, org-ascii-code, org-ascii-drawer,
  org-ascii-headline, org-ascii-inline-src-block,
  org-ascii-format-inlinetask-default, org-ascii-inlinetask,
  org-ascii-link, org-ascii-paragraph, org-ascii-quote-block,
  org-ascii-section, org-ascii-src-block, org-ascii-table,
  org-ascii--table-cell-width, org-ascii-table-cell,
  org-ascii-verbatim, org-ascii-verse-block,
  org-ascii-filter-paragraph-spacing): Use options instead of
  hard coded variables.

4 days agoMerge branch 'maint'
Nicolas Goaziou [Fri, 25 Jul 2014 09:21:56 +0000]
Merge branch 'maint'

4 days agoox-odt: Silence byte-compiler
Nicolas Goaziou [Fri, 25 Jul 2014 09:20:49 +0000]
ox-odt: Silence byte-compiler

* lisp/ox-odt.el (org-odt--format-paragraph): Change signature to
  include info.
(org-odt-footnote-reference, org-odt-paragraph): Apply signature

4 days agoMerge branch 'maint'
Nicolas Goaziou [Fri, 25 Jul 2014 09:05:49 +0000]
Merge branch 'maint'

4 days agoorg-clock: Update syntax for indentation in clock tables
Nicolas Goaziou [Fri, 25 Jul 2014 09:02:55 +0000]
org-clock: Update syntax for indentation in clock tables

* lisp/org-clock.el (org-clocktable-indent-string): Use "\emsp"
  instead of "\__", which is not supported anymore since Org 8.0.

Thanks to Buddy Butterfly for reporting it.

5 days agoMerge branch 'maint'
Nicolas Goaziou [Thu, 24 Jul 2014 13:01:25 +0000]
Merge branch 'maint'

5 days agoox-odt: Fix handling of quoted and centered paragraphs
Nicolas Goaziou [Thu, 24 Jul 2014 12:48:47 +0000]
ox-odt: Fix handling of quoted and centered paragraphs

* lisp/ox-odt.el (org-odt--paragraph-style): New function.
(org-odt--format-paragraph): Use new function to get proper style to

Thanks to Baptiste for reporting it.

5 days agoMerge branch 'maint'
Nick Dokos [Thu, 24 Jul 2014 03:58:13 +0000]
Merge branch 'maint'

5 days agoWhen editing a table formula, point is not necessarily on its referent.
Nick Dokos [Tue, 22 Jul 2014 21:11:36 +0000]
When editing a table formula, point is not necessarily on its referent.

* org-table.el (org-table-show-reference): Call `set-window-start'
  with the calculated values `min' and `max', not with
  (point-min) and (point-max).

Reported by Luke Crook (
    Thorsten Grothe (
    and Robert Klein in the latter thread.

Robert Klein bisected it down to 30220ffcdcef45c0237f80a2347d4da19877f64a.

6 days agoorg-element.el: Allow one-line LaTeX environments
Rasmus [Tue, 22 Jul 2014 13:09:03 +0000]
org-element.el: Allow one-line LaTeX environments

* org-element.el (org-element--latex-begin-environment,
org-element--latex-end-environment): New format strings to identify
beginning and ending of LaTeX environments.
(org-element-latex-environment-parser, org-element-paragraph-parser,
org-element--current-element): Use `org-element--latex-begin-environment'
and `org-element--latex-end-environment'.

* test-org-element.el (test-org-element/latex-environment-parser):
Add tests.

6 days agoMerge branch 'maint'
Nicolas Goaziou [Wed, 23 Jul 2014 08:09:04 +0000]
Merge branch 'maint'

6 days agoorg-element: Fix test failure
Nicolas Goaziou [Wed, 23 Jul 2014 08:07:55 +0000]
org-element: Fix test failure

* lisp/org-element.el (org-element--current-element): Fix regexp.

7 days agoMerge branch 'maint'
Nicolas Goaziou [Tue, 22 Jul 2014 09:55:33 +0000]
Merge branch 'maint'

7 days agoorg-element: Fix regexp matching LaTeX environments
Nicolas Goaziou [Tue, 22 Jul 2014 09:52:32 +0000]
org-element: Fix regexp matching LaTeX environments

* lisp/org-element.el (org-element--current-element): Fix regexp
  matching latex environments.  Discrepancy with regexp used in
  `org-element-latex-environment-parser' introduced matching errors.

9 days agoorg-element: Small optimization
Nicolas Goaziou [Sun, 20 Jul 2014 17:22:00 +0000]
org-element: Small optimization

* lisp/org-element.el (org-element--cache-for-removal): Do not remove
a robust element whenever only its contents are modified.  Remove
inlinetasks as robust elements since modifying a node property inside
implies to parse the task again.

9 days agoorg-element: Fix infloop in cache
Nicolas Goaziou [Sun, 20 Jul 2014 15:50:23 +0000]
org-element: Fix infloop in cache

* lisp/org-element.el (org-element--cache-process-request): Take into
  consideration changes to come so as to avoid parsing elements with
  false beginning positions.
(org-element--cache-sync): Change signature.

Thanks to Thorsten Jolitz for reporting it.

9 days agoorg-element: Better collision handling in cache sync requests
Nicolas Goaziou [Sun, 20 Jul 2014 15:49:36 +0000]
org-element: Better collision handling in cache sync requests

* lisp/org-element.el (org-element--cache-process-request): Handle
  cases where procesing the first request brings us past the start of
  the next one.

10 days agoMerge branch 'maint'
Nick Dokos [Sat, 19 Jul 2014 03:47:03 +0000]
Merge branch 'maint'

Merge bug fix for org-table.el:org-table-clean-before-export.

10 days agoorg-clean-before-export matches non-special columns spuriously
Nick Dokos [Fri, 18 Jul 2014 13:09:38 +0000]
org-clean-before-export matches non-special columns spuriously

* org-table.el (org-table-clean-before-export): The regexes match
  spaces in addition to the special characters that might be used in
  the first column as special marking characters.  Remove the space
  from the character class.

  In addition, the `special' variable included a backslash which
  afaict does nothing: delete it.

  The function itself takes an optional parameter which is not used by
  any of the callers: get rid of it.  Getting rid of it allows a small
  simplification of the code.

The bug was found by Thorsten Grothe:

12 days agoorg-element: Fix re-parenting during cache synchronization
Nicolas Goaziou [Thu, 17 Jul 2014 16:11:49 +0000]
org-element: Fix re-parenting during cache synchronization

* lisp/org-element.el (org-element--cache-process-request): Correctly
  re-parent elements in cache in some corner cases.
* testing/lisp/test-org-element.el (test-org-element/cache): Add tests.

12 days agoorg-element: Fix corner case in cache synchronization
Nicolas Goaziou [Thu, 17 Jul 2014 16:08:06 +0000]
org-element: Fix corner case in cache synchronization

* lisp/org-element.el (org-element--cache-submit-request): When
  changes happen before first know element, start from phase 1 instead
  of phase 2 in order to properly re-parent subsequent elements, if
(org-element--cache-process-request): Do not propagate beginning
position since it is already available to the request.

12 days agoorg-element: Fix "wrong-type-argument" error in cache
Nicolas Goaziou [Thu, 17 Jul 2014 13:46:42 +0000]
org-element: Fix "wrong-type-argument" error in cache

* lisp/org-element.el (org-element--cache-sync): Do not copy phase
  number into next request.  This is a special case that deserves to
  be handled locally.  See below.
(org-element--cache-process-request): Properly transfer phase in
a special case, which is now commented.  Also fix phase numbers in
comments.  Small refactoring.

Thanks to Alan Schmitt for reporting it.

13 days agoox: Fix inline footnote definitions
Nicolas Goaziou [Wed, 16 Jul 2014 14:11:52 +0000]
ox: Fix inline footnote definitions

* lisp/ox.el (org-export-collect-tree-properties): Make sure changes
  to the parse tree propagate to the value of

Thanks to Florian Beck for reporting it.

2 weeks agocontrib/lisp/org-contacts.el: Fix a bug when contacts don't have an email address
Grégoire Jadi [Sun, 13 Jul 2014 10:33:34 +0000]
contrib/lisp/org-contacts.el: Fix a bug when contacts don't have an email address

* contrib/lisp/org-contacts.el (org-contacts-complete-tags-props,
org-contacts-complete-group): Fix a bug when contacts don't have an
email address.

2 weeks agocontrib/lisp/org-contacts.el: Complete contacts using tags and properties
Grégoire Jadi [Sun, 13 Jul 2014 10:28:49 +0000]
contrib/lisp/org-contacts.el: Complete contacts using tags and properties

* contrib/lisp/org-contacts.el (org-contacts-complete-tags-props): New
function that allows the user to retrieve contacts based on tags and

(org-contacts-complete-functions): Add
org-contacts-complete-tags-props to the completion functions.

(org-contacts-tags-props-prefix): Prefix used to detect the
completion method wished.

Based on the idea and implementation of John Kitchin