3 years agoFix C-c C-c behaviour on some objects release_8.2.4
Nicolas Goaziou [Tue, 3 Dec 2013 20:41:48 +0000 (21:41 +0100)]
Fix C-c C-c behaviour on some objects

* lisp/org.el (org-ctrl-c-ctrl-c): When point is on an unsupported
  object, look for something to do at a higher level instead of
  bailing out.

For example, C-c C-c should toggle checkbox in the following example
even though X point is technically on a subscript.

  - [ ] a_Xb

3 years agoox-html: Fix LaTeX fragments export
Nicolas Goaziou [Tue, 3 Dec 2013 19:52:22 +0000 (20:52 +0100)]
ox-html: Fix LaTeX fragments export

* lisp/ox-html.el (org-html-format-latex): Add an argument.  Ensure
  latex header is the same as specified in the original buffer when
  exporting a LaTeX fragment or environment.
(org-html-latex-environment, org-html-latex-fragment): Apply signature

3 years agoFix customization types in org-drill.el
Carsten Dominik [Tue, 3 Dec 2013 17:03:49 +0000 (18:03 +0100)]
Fix customization types in org-drill.el

* contrib/lisp/org-drill.el (org-drill-leech-method):
(org-drill-spaced-repetition-algorithm): Fix customization types.

3 years agoDocumentation for :export: tag usage
Nicolas Goaziou [Sun, 1 Dec 2013 12:32:26 +0000 (13:32 +0100)]
Documentation for :export: tag usage

* doc/org.texi (Export settings): documentation describing how text
above the first heading is ignored when an :export: tag is in a file.

Commit 7cf4406088d4d7f50c35c6ba7ca3c351db2086bc introduced a feature of
the exporter that ignores text above the first headline when an :export:
tag is used anywhere in a file. This commit documents that behaviour
introduced in 7cf44060, in doc/org.texi.


3 years agoox-freemind: Fix comma error when exporting
Nicolas Goaziou [Thu, 28 Nov 2013 10:44:44 +0000 (11:44 +0100)]
ox-freemind: Fix comma error when exporting

* contrib/lisp/ox-freemind.el (org-freemind-export-to-freemind): Fix
  code typo.

Reported-by: Jan-Mark Batke <>
3 years agoox-publish: Error when publishing non-existent file
Nicolas Goaziou [Mon, 25 Nov 2013 22:31:35 +0000 (23:31 +0100)]
ox-publish: Error when publishing non-existent file

* lisp/ox-publish.el (org-publish-cache-ctime-of-src): Return an error
  when publishing a non-existent file.

Suggested-by: Arne Babenhauserheide <>
3 years agoorg-element: Update paragraph separate regexp
Nicolas Goaziou [Mon, 25 Nov 2013 22:19:48 +0000 (23:19 +0100)]
org-element: Update paragraph separate regexp

* lisp/org-element.el (org-element-paragraph-separate): More accurate

3 years agoorg-crypt: fix 3e87d5893d
Achim Gratz [Sat, 23 Nov 2013 15:15:45 +0000 (16:15 +0100)]
org-crypt: fix 3e87d5893d

* lisp/org-crypt.el: Declare `epg-context´.
  (org-encrypt-string): Correct indentation.

3 years agoUse key-description on the keys mentionned by the functions defined by
Nicolas Richard [Tue, 12 Nov 2013 08:02:23 +0000 (09:02 +0100)]
Use key-description on the keys mentionned by the functions defined by

3 years agoRemove old comment
Nicolas Richard [Thu, 7 Nov 2013 08:15:36 +0000 (09:15 +0100)]
Remove old comment

The comment was introduced (in git) at commit
4be4c56239c224094e717dcd57068f58f99c2dfc ; it refers to a
FIXME located ~40 lines above it. The FIXME was removed in

3 years agoFix export of links to attachements (part 2)
Nicolas Goaziou [Fri, 22 Nov 2013 11:42:41 +0000 (12:42 +0100)]
Fix export of links to attachements (part 2)

* lisp/org.el (org-entry-get): Widen buffer in order to retrieve
  properties, as `org-entry-properties' and
  `org-entry-get-with-inheritance' already do.

3 years agoorg-compat: Support for getting data from Windows clipboard
Alexander Vorobiev [Mon, 18 Nov 2013 00:27:14 +0000 (18:27 -0600)]
org-compat: Support for getting data from Windows clipboard

* lisp/org-compat.el (org-get-x-clipboard): Use w32-get-clipboard-data
to get the clipboard data under Windows.


3 years agoox-html: Fix TOC entries
Nicolas Goaziou [Fri, 22 Nov 2013 08:26:58 +0000 (09:26 +0100)]
ox-html: Fix TOC entries

* lisp/ox-html.el (org-html--format-toc-headline): Add missing
  headline number in TOC entries.  This fixes commit

3 years agoorg.texi: Fix export snippet syntax in ODT backend
Nicolas Goaziou [Wed, 20 Nov 2013 21:01:10 +0000 (22:01 +0100)]
org.texi: Fix export snippet syntax in ODT backend

* doc/org.texi (Creating one-off styles): Use new export snippet

3 years agoorg-crypt.el: Fix warning
Thierry Volpiatto [Wed, 20 Nov 2013 18:26:12 +0000 (19:26 +0100)]
org-crypt.el: Fix warning

* org-crypt.el (org-encrypt-string, org-encrypt-entry)
(org-decrypt-entry): Fix warning.


epg-context is let-bounded in org-crypt and then epg local set it in
this context.  It should just be set as local var instead of being let


4 years agoFix export of links to attachements
Nicolas Goaziou [Mon, 18 Nov 2013 18:11:17 +0000 (19:11 +0100)]
Fix export of links to attachements

* lisp/org.el (org-entry-properties): Ignore narrowing when retrieving
  current headline properties.

4 years agoBackport Paul's fixes from Emacs trunk (2/2)
Bastien Guerry [Sun, 17 Nov 2013 08:15:25 +0000 (09:15 +0100)]
Backport Paul's fixes from Emacs trunk (2/2)


4 years agoBackport Paul's fixes from Emacs trunk (1/2)
Bastien Guerry [Sun, 17 Nov 2013 08:12:41 +0000 (09:12 +0100)]
Backport Paul's fixes from Emacs trunk (1/2)


4 years agoFix version for org-(export-with|use)-sub-superscript
Bastien Guerry [Sun, 17 Nov 2013 07:46:50 +0000 (08:46 +0100)]
Fix version for org-(export-with|use)-sub-superscript

* ox.el (org-export-with-sub-superscripts):
* org.el (org-use-sub-superscripts): Fix version and enhance
docstring again.

4 years agoEnhance docstrings
Bastien Guerry [Fri, 15 Nov 2013 09:08:25 +0000 (10:08 +0100)]
Enhance docstrings

* ox.el (org-export-with-sub-superscripts):
* org.el (org-use-sub-superscripts): Enhance docstrings.

Thansk to Dieter and Nick for raising this.

4 years agoorg.el: Fix a variable name error release_8.2.3c
Achim Gratz [Thu, 14 Nov 2013 20:21:58 +0000 (21:21 +0100)]
org.el: Fix a variable name error

* lisp/org.el (org-version): Fix an error imported with merge in
  f95641c443, replace `_version´ by `version1´.

4 years agoRemove org-autoload.
Bastien Guerry [Fri, 15 Nov 2013 05:53:59 +0000 (06:53 +0100)]
Remove org-autoload.

* org-macs.el (org-autoload): Delete.

* org-docview.el ("docview"): Fix declarations and require
doc-view directly.

* org-id.el (org-id-copy)
(org-id-get-with-outline-drilling, org-id-new):
* org-colview.el:
(org-columns-open-link, org-string-to-number):
* org-clock.el:
(org-clock-put-overlay, org-count-quarter, org-clock-loaded):
* org-archive.el (org-get-local-archive-location):
* org-agenda.el (org-agenda-todo-custom-ignore-p):

Those functions were autoloaded from within calls to `org-autoload'
in org.el, we now autoload them from where they live.

4 years agoPartially revert commit adcebf
Bastien Guerry [Fri, 15 Nov 2013 05:22:36 +0000 (06:22 +0100)]
Partially revert commit adcebf

* ox.el (org-export-async-init-file):
* ox-odt.el (org-odt-with-latex):
* ox-html.el (org-html-with-latex):
* org.el (org-return-follows-link):
* ob-python.el (org-babel-python-command): Don't use :set.

Thanks to Glenn Morris for pointing at this.

4 years agoox-odt.el (org-odt-content-template-file): Fix version
Bastien Guerry [Thu, 14 Nov 2013 13:13:46 +0000 (14:13 +0100)]
ox-odt.el (org-odt-content-template-file): Fix version

* ox-odt.el (org-odt-content-template-file): Fix version.

4 years agoFix errors reported by cus-test.el
Bastien Guerry [Thu, 14 Nov 2013 13:05:18 +0000 (14:05 +0100)]
Fix errors reported by cus-test.el

* ox.el (org-export-async-init-file): Use :set to set the
default value.

* ox-texinfo.el (org-texinfo-filename): Fix default value.
(org-texinfo-format-headline-function): Use 'ignore as the
default value.
(org-texinfo-format-drawer-function): Use a function as the
default value.  Update docstring.
(org-texinfo-drawer): Always use
`org-texinfo-format-drawer-function' as it is now a function
by default.
(org-texinfo-headline): Compare
`org-texinfo-format-headline-function' against 'ignore.
(org-texinfo-inlinetask): Compare
`org-texinfo-format-inlinetask-function' against 'ignore.

* ox-odt.el (org-odt-format-drawer-function): Use a function
as the default value.  Update docstring.
(org-odt-format-inlinetask-function): Fix default value.
(org-odt-with-latex): Use :set to set the default value.
(org-odt-drawer): Always use `org-odt-format-drawer-function'
as it is now a function by default.
(org-odt-format-headline--wrap): Compare
`org-odt-format-headline-function' against 'ignore.

* ox-latex.el (org-latex-format-drawer-function): Use a
function as the default value.  Update docstring.
(org-latex-format-inlinetask-function): Fix default value.
(org-latex-drawer): Always use
`org-latex-format-drawer-function' as it is now a function by
(org-latex-inlinetask): Compare
`org-latex-format-inlinetask-function' against 'ignore.

* ox-html.el (org-html-format-drawer-function): Use a
function as the default value.  Update docstring.
(org-html-format-inlinetask-function): Fix default value.
(org-html-with-latex): Use :set to set the default value.
(org-html-format-headline--wrap): Compare
`org-html-format-headline-function' against 'ignore.
(org-html-inlinetask): Compare
`org-html-format-inlinetask-function' against 'ignore.

* ox-ascii.el (org-ascii-format-drawer-function): Use a
function as the default value.  Update docstring.
(org-ascii-drawer): Always use
`org-ascii-format-drawer-function' as it is now a function by
(org-ascii-format-inlinetask-default): New function.
(org-ascii-format-inlinetask-function): Use
`org-ascii-format-inlinetask-default' as the default.

* org.el (org-mouse-1-follows-link): Use :set to set the
default value.  Update custom type.
(org-log-note-headings): Fix order or list items in the custom
(orgstruct-heading-prefix-regexp): Use an empty string as the
default value.  Use 'regexp as the custom type.
(orgstruct-make-binding): Tiny docstring enhancement.  Assume
`orgstruct-heading-prefix-regexp' is a string.

* org-agenda.el (org-agenda-search-view-max-outline-level):
Set default value to 0.  Update docstring.
(org-agenda-deadline-leaders): Fix custom type.
(org-search-view): Assume
`org-agenda-search-view-max-outline-level' is a number.

* ob-ruby.el (org-babel-ruby-nil-to): Fix custom type.

* ob-python.el (org-babel-python-mode): Use :set to set the
default value.
(org-babel-python-None-to): Fix custom type.

* ob-plantuml.el (org-plantuml-jar-path): Fix default value.
(org-babel-execute:plantuml): Assume `org-plantuml-jar-path'
is a string.

* ob-latex.el (org-babel-latex-htlatex): Fix default value.
(org-babel-latex-htlatex-packages): Fix custom type.
(org-babel-execute:latex): Assume `org-babel-latex-htlatex' is
a string.

Thanks to Glenn Morris for reporting this.

4 years agoox-odt.el (org-odt-display-outline-level): Fix version
Bastien Guerry [Thu, 14 Nov 2013 08:54:35 +0000 (09:54 +0100)]
ox-odt.el (org-odt-display-outline-level): Fix version

* ox-odt.el (org-odt-display-outline-level): Fix version.

4 years agoFix previous commits
Bastien Guerry [Wed, 13 Nov 2013 07:46:01 +0000 (08:46 +0100)]
Fix previous commits

Thanks to Jambunathan for pointing this.

4 years agoox-odt.el: Add version and package-version to some options
Bastien Guerry [Wed, 13 Nov 2013 06:35:57 +0000 (07:35 +0100)]
ox-odt.el: Add version and package-version to some options

* ox-odt.el (org-odt-inline-formula-rules)
(org-odt-inline-image-rules, org-odt-use-date-fields): Add
version and package-version.

4 years agoox-html.el: Add version and package-version to some options
Bastien Guerry [Wed, 13 Nov 2013 06:27:10 +0000 (07:27 +0100)]
ox-html.el: Add version and package-version to some options

* ox-html.el (org-html-format-drawer-function)
(org-html-creator-string): Add version and package-version.

Thanks to Jambunathan for reporting problems in this area.

4 years agoox-html.el (org-html-text-markup-alist): Fix version
Bastien Guerry [Tue, 12 Nov 2013 20:24:32 +0000 (21:24 +0100)]
ox-html.el (org-html-text-markup-alist): Fix version

* ox-html.el (org-html-text-markup-alist): Fix version.

Thanks to Jambunathan for reporting this.

4 years agoorg-agenda.el (org-agenda-set-restriction-lock): Autoload release_8.2.3b
Bastien Guerry [Tue, 12 Nov 2013 20:12:28 +0000 (21:12 +0100)]
org-agenda.el (org-agenda-set-restriction-lock): Autoload

* org-agenda.el (org-agenda-set-restriction-lock): Autoload.

4 years agoBackport changes from Emacs revs 115081 and 115082
Bastien Guerry [Tue, 12 Nov 2013 19:57:31 +0000 (20:57 +0100)]
Backport changes from Emacs revs 115081 and 115082

2013-11-12  Stefan Monnier  <>

Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
* ob-python.el (org-babel-python-table-or-string)
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).

2013-11-12  Glenn Morris  <>

* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.

4 years agoorg.el (org-deadline, org-schedule): Fix bug release_8.2.3 release_8.2.3a
Bastien Guerry [Mon, 11 Nov 2013 17:13:08 +0000 (18:13 +0100)]
org.el (org-deadline, org-schedule): Fix bug

* org.el (org-deadline, org-schedule): Fix bug: allow to
update scheduled/deadline information anywhere in the subtree.

4 years agoREADME_maintainer: Fix erroneous statement
Bastien Guerry [Mon, 11 Nov 2013 15:59:19 +0000 (16:59 +0100)]
README_maintainer: Fix erroneous statement

* README_maintainer: Fix erroneous statement.

4 years agoox-texinfo: Fix incorrect @documentencoding
Nicolas Goaziou [Mon, 11 Nov 2013 09:09:21 +0000 (10:09 +0100)]
ox-texinfo: Fix incorrect @documentencoding

* lisp/ox-texinfo.el (org-texinfo-supported-coding-systems): New
(org-texinfo-template): Find appropriate encoding among those

Reported-by: Suvayu Ali <>
4 years agoox: Fix next/previous element getters
Nicolas Goaziou [Mon, 11 Nov 2013 00:54:01 +0000 (01:54 +0100)]
ox: Fix next/previous element getters

* lisp/ox.el (org-export-get-previous-element,
  org-export-get-next-element): Fix return value for non plain text
  objects in a secondary string.
* testing/lisp/test-ox.el: Add tests.

4 years agoorg-element: Fix infloops
Nicolas Goaziou [Sun, 10 Nov 2013 10:28:14 +0000 (11:28 +0100)]
org-element: Fix infloops

* lisp/org-element.el (org-element-center-block-parser)
  (org-element-drawer-parser, org-element-dynamic-block-parser)
  (org-element-inlinetask-parser, org-element-property-drawer-parser)
  (org-element-quote-block-parser, org-element-comment-block-parser)
  (org-element-diary-sexp-parser, org-element-example-block-parser)
  (org-element-keyword-parser, org-element-latex-environment-parser)
  (org-element-paragraph-parser, org-element-src-block-parser)
  (org-element-table-parser, org-element-verse-block-parser): Fix
  infloop when buffer ends with a non-empty blank line after the
* testing/lisp/test-org-element.el: Add tests.

4 years agoorg-element: Fix infloop
Nicolas Goaziou [Sun, 10 Nov 2013 09:18:17 +0000 (10:18 +0100)]
org-element: Fix infloop

* lisp/org-element.el (org-element-comment-parser): Fix infloop when
  a non-empty blank line follows a comment at the end of the buffer.
* testing/lisp/test-org-element.el: Add test.

4 years agoorg.el (org-align-tags-here): Fix bug: move to the correct position
Bastien Guerry [Sat, 9 Nov 2013 16:47:59 +0000 (17:47 +0100)]
org.el (org-align-tags-here): Fix bug: move to the correct position

* org.el (org-align-tags-here): Fix bug: move to the correct

Thanks to Reuben Garrett for reporting this bug.

4 years agoox-latex: Remove all temporary files when compiling release_8.2.2
Nicolas Goaziou [Fri, 8 Nov 2013 07:54:52 +0000 (08:54 +0100)]
ox-latex: Remove all temporary files when compiling

* lisp/ox-latex.el (org-latex-compile): Remove all numbered temporary
  files after compiling.

4 years agoox-org: Fix headline level during subtree export
Nicolas Goaziou [Wed, 6 Nov 2013 18:14:14 +0000 (19:14 +0100)]
ox-org: Fix headline level during subtree export

* lisp/org-element.el (org-element-headline-interpreter): Take into
  consideration `org-odd-levels-only' when building a headline.
* lisp/ox-org.el (org-org-headline): Correctly set transcoded headline
  level during subtree export.

4 years agoorg-inlinetask: Hide inline tasks in 'children visibility state
Jonas Hoersch [Wed, 30 Oct 2013 14:39:33 +0000 (15:39 +0100)]
org-inlinetask: Hide inline tasks in 'children visibility state

* lisp/org.el (org-cycle-hide-inline-tasks): Re-hide inline tasks when
  switching to 'children visibility state.


4 years agoorg-capture.el (org-capture-refile): Don't finalize prematurely
Bastien Guerry [Wed, 6 Nov 2013 15:26:38 +0000 (16:26 +0100)]
org-capture.el (org-capture-refile): Don't finalize prematurely

* org-capture.el (org-capture-refile): Don't finalize

Thanks to Rodrigo Amestica for reporting this.

4 years agoorg.el (org-agenda-prepare-buffers): Restore the point position
Bastien Guerry [Wed, 6 Nov 2013 15:15:45 +0000 (16:15 +0100)]
org.el (org-agenda-prepare-buffers): Restore the point position

* org.el (org-agenda-prepare-buffers): Restore the point

Thanks to Samuel Wales for spotting this.

4 years agoox-html: Add TODO keyword to TOC entries
Nicolas Goaziou [Wed, 6 Nov 2013 14:26:53 +0000 (15:26 +0100)]
ox-html: Add TODO keyword to TOC entries

* lisp/ox-html.el (org-html--format-toc-headline): TOC entries are
  closer to regular headline formatting.

4 years agoorg-capture: Fix bug when capturing with templates using `function'
Bastien Guerry [Wed, 6 Nov 2013 14:51:57 +0000 (15:51 +0100)]
org-capture: Fix bug when capturing with templates using `function'

* org-capture.el (org-capture): Store :return-to-wconf
(org-capture-place-template): Don't store :return-to-wconf
when called from a capture template using `function', rely on
the early :return-to-wconf value store from `org-capture'.

Thanks to Brett Viren for raising this issue.

4 years agoorg-agenda: Fix bug when showing the new time
Bastien Guerry [Wed, 6 Nov 2013 08:59:46 +0000 (09:59 +0100)]
org-agenda: Fix bug when showing the new time

* org-agenda.el (org-agenda-show-new-time): Ignore invisible
text when inserting the new time as a text property.

* org-compat.el (org-move-to-column): New argument
`ignore-invisible' to turn on `buffer-invisibility-spec'.

Thanks to Marcin Borkowski and Karl Voit for reporting this.

4 years agoorg.el (org-insert-link): Don't remove brackets when they belong to a timestamp in...
Bastien Guerry [Tue, 5 Nov 2013 20:54:12 +0000 (21:54 +0100)]
org.el (org-insert-link): Don't remove brackets when they belong to a timestamp in a headline

* org.el (org-insert-link): Don't remove brackets when they
belong to a timestamp in a headline.

Thanks to David Belohrad for spotting this.

4 years agoorg-agenda.el (org-agenda-filter-make-matcher): Fix regression
Bastien Guerry [Tue, 5 Nov 2013 18:41:41 +0000 (19:41 +0100)]
org-agenda.el (org-agenda-filter-make-matcher): Fix regression

* org-agenda.el (org-agenda-filter-make-matcher): When
filtering tags and hitting space, filter out entries with
tags, only keep those without tags.

Thanks to Serguei Son for reporting this regression.

4 years agoox-odt.el (org-odt-table-style-format): Use %s for inserting the rel-width property...
Bastien Guerry [Tue, 5 Nov 2013 16:26:46 +0000 (17:26 +0100)]
ox-odt.el (org-odt-table-style-format): Use %s for inserting the rel-width property as a string

* ox-odt.el (org-odt-table-style-format): Use %s for inserting
the rel-width property as a string.
(org-odt-template): Fall back on a string for :rel-width.

Thanks to Derek Feichtinger for reporting this bug.

4 years agoSome clean-up related to org-remember being removed
Bastien Guerry [Tue, 5 Nov 2013 11:13:46 +0000 (12:13 +0100)]
Some clean-up related to org-remember being removed

* org.el (org-directory, org-default-notes-file)
(org-reverse-note-order): Don't use the `org-remember'
customization group.
(org-require-autoloaded-modules): Don't require

* org-capture.el: Update commentary section to reflect the
fact that org-remember.el is not used anymore.

4 years agocontrib/lisp/ox-rss.el: Enhance RFC822 formatting string
Bastien Guerry [Mon, 4 Nov 2013 23:14:03 +0000 (00:14 +0100)]
contrib/lisp/ox-rss.el: Enhance RFC822 formatting string

* contrib/lisp/ox-rss.el (org-rss-headline)
(org-rss-build-channel-info): Use %b instead of %h for RFC822

Thanks to Andrea Rossetti for reporting this.

4 years agoorg-agenda.el (org-agenda-drag-line-forward): Fix bugs
Bastien Guerry [Mon, 4 Nov 2013 22:36:18 +0000 (23:36 +0100)]
org-agenda.el (org-agenda-drag-line-forward): Fix bugs

* org-agenda.el (org-agenda-drag-line-forward)
(org-agenda-drag-line-backward): Fix bugs: don't drag lines
without text and don't drag lines before/after hidden lines.

Thanks to Thomas Morgan for reporting bugs in this area.

4 years agoorg.texi (Catching invisible edits): Fix typo
Bastien Guerry [Mon, 4 Nov 2013 11:45:22 +0000 (12:45 +0100)]
org.texi (Catching invisible edits): Fix typo

* org.texi (Catching invisible edits): Fix typo.

Thanks to Cyprien Gay for reporting this.

4 years agoorg.el (org-babel-load-file): Set `exported-file' correctly
Bastien Guerry [Mon, 4 Nov 2013 11:19:45 +0000 (12:19 +0100)]
org.el (org-babel-load-file): Set `exported-file' correctly

* org.el (org-babel-load-file): Set `exported-file' correctly,
in case the file as been tangled using a buffer-local value.

* ob-tangle.el (org-babel-tangle-file): Return the list of
tangled files.

Thanks to Sam Flint for reporting this.

4 years agoorg-element: Fix error when parsing lowercase keywords
Nicolas Goaziou [Sun, 3 Nov 2013 16:47:55 +0000 (17:47 +0100)]
org-element: Fix error when parsing lowercase keywords

* lisp/org-element.el (org-element-context): Fix error when parsing
  affiliated keywords, e.g. "caption".
* testing/lisp/test-org-element.el: Add test.

4 years agoFix flyspell behaviour on verbatim objects
Nicolas Goaziou [Sun, 3 Nov 2013 13:18:19 +0000 (14:18 +0100)]
Fix flyspell behaviour on verbatim objects

* lisp/org.el (org-do-emphasis-faces): Look for verbatim status at
  correct location.

4 years agoFix wrong-type-argument error when opening id link
Nicolas Goaziou [Sun, 3 Nov 2013 12:06:14 +0000 (13:06 +0100)]
Fix wrong-type-argument error when opening id link

* lisp/org.el (org-open-at-point): Check if link is non-nil before
  matching it.

Reported-by: Daniel Clemente <>
4 years agoox: Fix OPTIONS in default template
Nicolas Goaziou [Sun, 3 Nov 2013 10:35:31 +0000 (11:35 +0100)]
ox: Fix OPTIONS in default template

* lisp/ox.el (org-export-insert-default-template): Make sure strings
  are properly quoted when inserting a template.  Specifically,
  default value for drawers should be d:(not "LOGBOOK"), not d:(not

4 years agoorg-inlinetask: fix inlinetask unfolding
Jonas Hoersch [Tue, 29 Oct 2013 16:07:49 +0000 (17:07 +0100)]
org-inlinetask: fix inlinetask unfolding

* lisp/org-inlinetask.el (org-inlinetask-toggle-visibility): Don't use
  `org-show-entry` as it cannot unfold an inlinetask properly.


4 years agoox-latex: Don't quote const in defcustom
Rüdiger Sonderfeld [Tue, 29 Oct 2013 16:20:20 +0000 (17:20 +0100)]
ox-latex: Don't quote const in defcustom

* lisp/ox-latex.el (org-latex-listings): Don't quote const value.

Quoting it would set `org-export-latex' not to `minted' but `(quote
minted)' and thus breaking the export.

Signed-off-by: Rüdiger Sonderfeld <>
4 years agoFix `org-insert-heading' at buffer boundaries
Nicolas Goaziou [Tue, 29 Oct 2013 08:55:01 +0000 (09:55 +0100)]
Fix `org-insert-heading' at buffer boundaries

* lisp/org.el (org-insert-heading): Do not error out when inserting is
  to be done at one of the buffer's boundaries.
* testing/lisp/test-org.el: Add tests.

4 years agoFix org-insert-todo-heading-respect-content in plain list item
Ingo Lohmar [Sun, 27 Oct 2013 16:34:22 +0000 (17:34 +0100)]
Fix org-insert-todo-heading-respect-content in plain list item

* lisp/org.el (org-insert-todo-heading-respect-content): Pass correct
prefix arg to always insert heading.


This function used a second argument t, which is eventually passed to
org-insert-heading, adding a list item when inside a plain list.  Use
the proper argument '(4) now, to always create a heading, just like
the function's name and documentation imply.

4 years agoCorrectly indent BEGIN_SRC and END_SRC lines
Joost Diepenmaat [Fri, 25 Oct 2013 09:08:46 +0000 (11:08 +0200)]
Correctly indent BEGIN_SRC and END_SRC lines

* lisp/org.el (org-indent-region): BEGIN_SRC and END_SRC lines should
  not be considered part of the source block for the purposes of


4 years agoox-latex: Fix docstring
Nicolas Goaziou [Sat, 26 Oct 2013 19:00:03 +0000 (21:00 +0200)]
ox-latex: Fix docstring

* lisp/ox-latex.el (org-latex-listings-options): Use correct number of
  backslash characters in the example.

Reported-by: Thomas S. Dye <>
4 years agoorg-element: Use `org-latex-regexps', not `org-format-latex-options'
Nicolas Goaziou [Thu, 24 Oct 2013 15:15:23 +0000 (17:15 +0200)]
org-element: Use `org-latex-regexps', not `org-format-latex-options'

* lisp/org-element.el (org-element-latex-or-entity-successor,
  org-element-latex-fragment-parser): Use `org-latex-regexps' instead
  of `org-format-latex-options'.
* testing/lisp/test-org-element.el: Fix tests.

`org-latex-regexps' defines the correct syntax for LaTeX code within
an Org buffer.  On the other hand, `org-format-latex-options'
determines which syntax can be previewed within the buffer.

4 years agoorg.texi: Remove reference to quoted underscores
Nicolas Goaziou [Thu, 24 Oct 2013 09:16:19 +0000 (11:16 +0200)]
org.texi: Remove reference to quoted underscores

* doc/org.texi (Subscripts and superscripts): Remove reference to
  quoted underscores until this mechanism is implemented again.

4 years agoorg.texi: Improve Beamer export documentation
Nicolas Goaziou [Thu, 24 Oct 2013 09:14:55 +0000 (11:14 +0200)]
org.texi: Improve Beamer export documentation

* doc/org.texi (Beamer export): Be more accurate about BEAMER_OPT

4 years agoox-odt: Stop adding leading space after line break
Christian Moe [Wed, 23 Oct 2013 16:49:03 +0000 (18:49 +0200)]
ox-odt: Stop adding leading space after line break

* lisp/ox-odt.el (org-odt-line-break, org-odt-plain-text): Remove
newline after line-break tag.

The exporter was pretty-printing the ODT XML with newlines after
forced line breaks, but LibreOffice would interpret those as
spaces.  This led to a leading space after every manual line break.

4 years agoox-taskjuggler: Fix effort property
Nicolas Goaziou [Wed, 23 Oct 2013 16:22:39 +0000 (18:22 +0200)]
ox-taskjuggler: Fix effort property

* contrib/lisp/ox-taskjuggler.el (org-taskjuggler--build-task): Fix
  effort property if `org-effort-property' was changed.

4 years agoexport back-ends: Remove duplicate information
Nicolas Goaziou [Sun, 20 Oct 2013 08:58:30 +0000 (10:58 +0200)]
export back-ends: Remove duplicate information

* lisp/ox-ascii.el: Remove comments at the beginning of the file since
  the library is documented in Org manual.
* lisp/ox-beamer.el: Remove comments at the beginning of the file since
  the library is documented in Org manual.
* lisp/ox-html.el: Remove comments at the beginning of the file since
  the library is documented in Org manual.
* lisp/ox-icalendar.el: Remove comments at the beginning of the file since
  the library is documented in Org manual.
* lisp/ox-md.el: Remove comments at the beginning of the file since
  the library is documented in Org manual.

4 years agoorg-element: Use `org-match-string-no-properties'.
Nicolas Goaziou [Wed, 16 Oct 2013 19:26:19 +0000 (21:26 +0200)]
org-element: Use `org-match-string-no-properties'.

* lisp/org-element.el (org-element--list-struct): Use

4 years agoorg-element: Fix block parsing in lists
Nicolas Goaziou [Wed, 16 Oct 2013 08:36:48 +0000 (10:36 +0200)]
org-element: Fix block parsing in lists

* lisp/org-element.el (org-element--list-struct): Fix block parsing in
* testing/lisp/test-org-element.el: Add test.

Reported-by: Omid <>
4 years agoox-org.el: Show all headings and all blocks before fontifying when htmlizing sources
Bastien Guerry [Mon, 14 Oct 2013 08:05:30 +0000 (10:05 +0200)]
ox-org.el: Show all headings and all blocks before fontifying when htmlizing sources

* ox-org.el (org-org-publish-to-org): When htmlizing an .org
file, ensure to show all headings and all blocks before

4 years agoorg.texi (Plain lists, Plain lists): Fix typos
Bastien Guerry [Mon, 14 Oct 2013 07:51:06 +0000 (09:51 +0200)]
org.texi (Plain lists, Plain lists): Fix typos

* org.texi (Plain lists, Plain lists): Fix typos.

Thanks to Elifsu Sabuncu for reporting this.

4 years agoox-publish: Fix compilation problem
Nicolas Goaziou [Sun, 13 Oct 2013 16:34:57 +0000 (18:34 +0200)]
ox-publish: Fix compilation problem

* lisp/ox-publish.el (org-publish-all): Fix compilation problem.

4 years agoorg-element: Fix interpreter for timestamp with delay
Nicolas Goaziou [Sun, 13 Oct 2013 16:13:35 +0000 (18:13 +0200)]
org-element: Fix interpreter for timestamp with delay

* lisp/org-element.el (org-element-timestamp-interpreter): Correctly
  interpret timestamps with delays.
* testing/lisp/test-org-element.el: Add test.

4 years agoorg-element: Parse warning delays in timestamps
Nicolas Goaziou [Sun, 13 Oct 2013 08:17:16 +0000 (10:17 +0200)]
org-element: Parse warning delays in timestamps

* lisp/org-element.el (org-element-timestamp-parser,
  org-element-timestamp-interpreter): Parse warning delays.
* testing/lisp/test-org-element.el (test-org-element/timestamp): Add

4 years agoUse instead of bzg AT gnu DOT org
Bastien Guerry [Tue, 8 Oct 2013 06:07:21 +0000 (08:07 +0200)]
Use instead of bzg AT gnu DOT org

4 years agoox: Fix a test
Nicolas Goaziou [Mon, 7 Oct 2013 17:02:49 +0000 (19:02 +0200)]
ox: Fix a test

* testing/lisp/test-ox.el (test-org-export/with-backend): Fix test.

4 years agoox-beamer: Fix b67ff6073c09b3f5c3878152d42efe34fcf0fd6e
Nicolas Goaziou [Mon, 7 Oct 2013 10:25:18 +0000 (12:25 +0200)]
ox-beamer: Fix b67ff6073c09b3f5c3878152d42efe34fcf0fd6e

* lisp/ox-beamer.el (org-beamer--format-section): Fix regression
  introduced in b67ff6073c09b3f5c3878152d42efe34fcf0fd6e, which would
  prevent frames from being propely exported.

4 years agoox: Fix `org-export-with-backend'
Nicolas Goaziou [Mon, 7 Oct 2013 14:47:51 +0000 (16:47 +0200)]
ox: Fix `org-export-with-backend'

* lisp/ox.el (org-export-with-backend): Ensure function will use
  provided back-end.
* testing/lisp/test-ox.el: Add test.

4 years agoorg-list: Fix misleading docstring
Nicolas Goaziou [Fri, 4 Oct 2013 19:13:23 +0000 (21:13 +0200)]
org-list: Fix misleading docstring

* lisp/org-list.el (org-list-allow-alphabetical): Remove reference to
  unused VALUE.

4 years agoox-beamer: Protect fragile commands in sections
Nicolas Goaziou [Thu, 3 Oct 2013 13:11:03 +0000 (15:11 +0200)]
ox-beamer: Protect fragile commands in sections

* lisp/ox-beamer.el (org-beamer--format-section): Protect fragile
  commands in sections.

4 years agoFix check-box toggling when point is on a link at an item
Nicolas Goaziou [Thu, 3 Oct 2013 11:41:09 +0000 (13:41 +0200)]
Fix check-box toggling when point is on a link at an item

* lisp/org.el (org-ctrl-c-ctrl-c): When using C-c C-c at an item with
  point on a link, make sure checkbox, if any, is toggled.

Reported-by: Christoph LANGE <>
4 years agoFix typos release_8.2.1
Carsten Dominik [Mon, 30 Sep 2013 08:56:33 +0000 (10:56 +0200)]
Fix typos

4 years agoox-beamer: Add a helpful error message
Nicolas Goaziou [Sun, 29 Sep 2013 08:22:14 +0000 (10:22 +0200)]
ox-beamer: Add a helpful error message

* lisp/ox-beamer.el (org-beamer--format-block): Return an error
  message when using a special environment as a block type.  Also
  check for incomplete environment definitions.

4 years agoProtect src overlay during saving the src snipped
Carsten Dominik [Tue, 24 Sep 2013 21:34:39 +0000 (23:34 +0200)]
Protect src overlay during saving the src snipped

* lisp/org-src.el (org-edit-src-exit): Let overlay survive after the
buffer has been saved.

4 years agoColumnview: Fix the case of #+ content present
Carsten Dominik [Sun, 22 Sep 2013 06:07:58 +0000 (08:07 +0200)]
Columnview: Fix the case of #+ content present

* lisp/org-colview.el (org-dblock-write:columnview): Change the
capture of pos to after inserting the original content

The problem is with a block that has content preceding the table.
Upon recreating the content, the `pos' gets set to the beginning of
this content instead of the table.  Later calls to
`org-table-recalculate' or `org-table-align' will fail because the
point is not at a table.

This patch moves the capture of `pos' to right before the insertion of
the table.

Patch by Benjamin Beckwith

4 years agoFix documentation of the org-footnote face
Alan Schmitt [Thu, 19 Sep 2013 12:27:19 +0000 (14:27 +0200)]
Fix documentation of the org-footnote face

* org-faces.el (org-footnote): Fix the documentation for this face.


4 years agoC-u C-u C-c ! inserts an active timestamp.
Nicolas Richard [Mon, 16 Sep 2013 13:42:25 +0000 (15:42 +0200)]
C-u C-u C-c ! inserts an active timestamp.

I suggest the following change so that C-u C-u C-c ! inserts an inactive
timestamp. I also document the INACTIVE argument of org-time-stamp.


From 5cdb18297d92f2d99334d98aa2f3b8a40e44702f Mon Sep 17 00:00:00 2001
From: Nicolas Richard <>
Date: Mon, 29 Apr 2013 09:02:21 +0200
Subject: [PATCH] Enforce the convention that C-c ! inserts inactive

* lisp/org.el (org-time-stamp): When INACTIVE is non-nil, insert an
  inactive timestamp also with double universal argument.

4 years agoGet rid of old style backquoting
Carsten Dominik [Fri, 20 Sep 2013 05:06:27 +0000 (07:06 +0200)]
Get rid of old style backquoting

* lisp/ox-texinfo.el (org-texinfo-export-to-texinfo): Use new style
(org-texinfo-export-to-info): Use new style backquoting.

Thanks to Mehul Sanghvi for the patch.

4 years agoDeclare a function in ob-core.el release_8.2
Carsten Dominik [Thu, 19 Sep 2013 03:21:06 +0000 (05:21 +0200)]
Declare a function in ob-core.el

4 years agoFix incorrect funtion call
Carsten Dominik [Thu, 19 Sep 2013 03:05:56 +0000 (05:05 +0200)]
Fix incorrect funtion call

* lisp/ob-latex.el (org-babel-execute:latex): Call `file-name-sans-extension'
instead of `file-base-name'.

4 years agoImprove behvior of org-insert-heading to end of subtree
Carsten Dominik [Thu, 19 Sep 2013 02:56:48 +0000 (04:56 +0200)]
Improve behvior of org-insert-heading to end of subtree

* lisp/org.el (org-insert-heading): Improve whitespace behavior at
end of subtree.

In a subtree with lots of empty space at the end, until now the new
entry would be inserted after all that whitespace.  Now, it is
inserted closer to the existing text, and the whitespace remains after
the new headline.

4 years agoWrite the news for release 8.2
Carsten Dominik [Thu, 19 Sep 2013 02:44:49 +0000 (04:44 +0200)]
Write the news for release 8.2

4 years agorm meaningless ":padnewlines" from default header args
Eric Schulte [Wed, 18 Sep 2013 21:20:51 +0000 (15:20 -0600)]
rm meaningless ":padnewlines" from default header args

* lisp/ob-core.el (org-babel-default-header-args): It is likely that
  someone meant to set :padlines to "yes", but accidentally set
  :padnewlines to "yes".  Either way lets just remove this which
  shouldn't have any functional effect.

4 years agodefault to :padline no for Haskell
Eric Schulte [Wed, 18 Sep 2013 21:19:54 +0000 (15:19 -0600)]
default to :padline no for Haskell

   Whitespace is significant in Haskell code so this could change
   program semantics.

* lisp/ob-haskell.el (org-babel-default-header-args:haskell): set
  :padlines to "no" by default.

4 years agoMerge branch 'maint'
Nicolas Goaziou [Wed, 18 Sep 2013 19:17:52 +0000 (21:17 +0200)]
Merge branch 'maint'

4 years agoorg-element: Fix `org-element-at-point' at end of buffer
Nicolas Goaziou [Wed, 18 Sep 2013 19:15:04 +0000 (21:15 +0200)]
org-element: Fix `org-element-at-point' at end of buffer

* lisp/org-element.el (org-element-at-point): If point is at the end
  of the buffer, and that buffer ends with a list, and there's no
  final newline, return last element in last item instead of plain
* testing/lisp/test-org-element.el: Add test.

This fix allows to fill correctly the following construct:

 - Item with a very long line ending at the end of buffer.