3 years agoUpdate copyright year for files changed since 2013 release_8.2.5a
Bastien Guerry [Sun, 5 Jan 2014 05:35:21 +0000 (06:35 +0100)]
Update copyright year for files changed since 2013

3 years agoRevert "Update copyright years."
Bastien Guerry [Sun, 5 Jan 2014 05:28:07 +0000 (06:28 +0100)]
Revert "Update copyright years."

This reverts commit 21105594fcb69fb4e1d636f4070fd25c86efbe35.

3 years agoBackport changes from Emacs r115870
Bastien Guerry [Sun, 5 Jan 2014 05:24:20 +0000 (06:24 +0100)]
Backport changes from Emacs r115870

* org.texi (Include files, The Export Dispatcher)
(Advanced configuration)
(Header arguments in Org mode properties): Spelling fixes.

3 years agoUpdate copyright years. release_8.2.5
Bastien Guerry [Sat, 4 Jan 2014 17:56:11 +0000 (18:56 +0100)]
Update copyright years.

3 years agoRevert "* (elpaplus-dirty elpaplus-up): Include htmlize.el."
Bastien Guerry [Sat, 4 Jan 2014 17:15:42 +0000 (18:15 +0100)]
Revert "* (elpaplus-dirty elpaplus-up): Include htmlize.el."

This reverts commit fc5cf0d92209f55a59077101e6f1ae77c3c8524f.

3 years agoFix ox-odt bugs
Bastien Guerry [Sat, 4 Jan 2014 17:09:31 +0000 (18:09 +0100)]
Fix ox-odt bugs

* ox-odt.el (org-odt--frame): Add a draw:name property to the
draw:frame tag.
(org-odt-format-label): Don't use short-caption at all.

for threads about these issues.

3 years agoorg-rmail.el (org-rmail-follow-link): Don't raise an error when no article is matched
Bastien Guerry [Sat, 4 Jan 2014 14:27:53 +0000 (15:27 +0100)]
org-rmail.el (org-rmail-follow-link): Don't raise an error when no article is matched

* org-rmail.el (org-rmail-follow-link): Don't raise an error
when no article is matched.

3 years agoFix creation of parent nodes when refiling.
Bastien Guerry [Sat, 4 Jan 2014 14:05:01 +0000 (15:05 +0100)]
Fix creation of parent nodes when refiling.

* org.el (org-refile-get-location): Check for a refile
position when the position is not nil, otherwise allow to
create the parent node if the user requests it.

Thanks to Li Zhuo for reporting this bug and for providing
a preliminary patch.

3 years agoorg.el (org-refile-allow-creating-parent-nodes): Fix typo in docstring
Bastien Guerry [Sat, 4 Jan 2014 13:53:00 +0000 (14:53 +0100)]
org.el (org-refile-allow-creating-parent-nodes): Fix typo in docstring

* org.el (org-refile-allow-creating-parent-nodes): Fix typo in

3 years agoMerge branch 'maint' of into maint
Bastien Guerry [Sat, 4 Jan 2014 13:48:51 +0000 (14:48 +0100)]
Merge branch 'maint' of into maint

3 years agoorg.el (org-entry-get): Minor docstring enhancement
Bastien Guerry [Sat, 4 Jan 2014 13:48:39 +0000 (14:48 +0100)]
org.el (org-entry-get): Minor docstring enhancement

* org.el (org-entry-get): Minor docstring enhancement.

3 years agoox-icalendar: Fix BBDB anniversaries integration
Nicolas Goaziou [Sat, 4 Jan 2014 13:26:19 +0000 (14:26 +0100)]
ox-icalendar: Fix BBDB anniversaries integration

* lisp/ox-icalendar.el (org-icalendar--combine-files): Make sure
  anniversaries do not end up in *Message* buffer instead of the ICS

Patch-by: Thomas Baumann <>
3 years agoorg.el (org-set-startup-visibility): Bugfix
Bastien Guerry [Sat, 4 Jan 2014 11:22:50 +0000 (12:22 +0100)]
org.el (org-set-startup-visibility): Bugfix

* org.el (org-set-startup-visibility): Bugfix.


3 years agoorg.el (org-shiftcontrolup, org-shiftcontroldown): Ignore `org-support-shift-select...
Bastien Guerry [Fri, 3 Jan 2014 16:38:02 +0000 (17:38 +0100)]
org.el (org-shiftcontrolup, org-shiftcontroldown): Ignore `org-support-shift-select' when point is on a clock log

* org.el (org-shiftcontrolup, org-shiftcontroldown): When
`org-support-shift-select' is not `nil', let-bind it to nil
if point is on a clock log.  Otherwise throw an error.

3 years agoob-lob.el: Minor custom and docstring fixes
Bastien Guerry [Fri, 3 Jan 2014 16:15:34 +0000 (17:15 +0100)]
ob-lob.el: Minor custom and docstring fixes

* ob-lob.el (org-babel-lob-files): Fix custom type.
(org-babel-lob-ingest): Small docstring fix.

Thanks to Glenn Morris for reporting them.

3 years agoorg-agenda.el (org-cmp-ts): Fix bug
Bastien Guerry [Fri, 3 Jan 2014 15:01:30 +0000 (16:01 +0100)]
org-agenda.el (org-cmp-ts): Fix bug

* org-agenda.el (org-cmp-ts): Fix bug: interpret `late' as
`later than any date' instead of `later than today'.

Thank to Michael Crouch for reporting this and to Michael Hoffman for
providing the fix.

3 years agoorg.el (org-do-emphasis-faces): Fix false positives handling
Bastien Guerry [Fri, 3 Jan 2014 10:16:14 +0000 (11:16 +0100)]
org.el (org-do-emphasis-faces): Fix false positives handling

* org.el (org-do-emphasis-faces): Handle false positives by
restarting the re-search one char after the beginning of the
match, not one char before its ending.

Before this fix, consider this buffer

** Headline
  - *Bold* non-bold
  - *Bold* non-bold

The first false positive is "** Headline\n  - *Bold*"

Starting the search again from the last "*" will skip
the "*Bold*" string.  Starting again at "* Headline" will
find it.

3 years agoorg.el (org-entry-put): Check that the value provided is a string
Bastien Guerry [Fri, 3 Jan 2014 09:07:09 +0000 (10:07 +0100)]
org.el (org-entry-put): Check that the value provided is a string

* org.el (org-entry-put): Check that the value provided is a
string.  If it is nil, convert it to the empty string.

3 years agoBackport r115828 from Emacs trunk
Bastien Guerry [Thu, 2 Jan 2014 15:10:44 +0000 (16:10 +0100)]
Backport r115828 from Emacs trunk

3 years agoRevert "Backport change from r115807 in Emacs trunk"
Bastien Guerry [Thu, 2 Jan 2014 15:08:26 +0000 (16:08 +0100)]
Revert "Backport change from r115807 in Emacs trunk"

This reverts commit c2ed678f20f7a4deccc3373c6a226163d5624cc8.

3 years agoox-html: Clean up some comments
Nicolas Goaziou [Wed, 1 Jan 2014 18:05:49 +0000 (19:05 +0100)]
ox-html: Clean up some comments

* lisp/ox-html.el: Clean up "FIXME" comments.

3 years agoox-publish: Fix a docstring
Nicolas Goaziou [Wed, 1 Jan 2014 18:02:13 +0000 (19:02 +0100)]
ox-publish: Fix a docstring

* lisp/ox-publish.el (org-publish-resolve-external-fuzzy-link): Fix

3 years agoox-html.el: Use classes for caption instead of align
Vladimir Lomov [Sat, 28 Dec 2013 22:33:59 +0000 (07:33 +0900)]
ox-html.el: Use classes for caption instead of align

* ox-html.el (org-html-style-default): New classes
caption.t-above and caption.t-bottom.
(org-html-table): Use new classes.


Signed-off-by: Vladimir Lomov <>
3 years agoRevert "ox-html.el: Use classes for caption instead of align"
Bastien Guerry [Mon, 30 Dec 2013 09:43:43 +0000 (10:43 +0100)]
Revert "ox-html.el: Use classes for caption instead of align"

This reverts commit 1813200fc81fa5e0f248407d852f3771fe2d4f6e.

3 years agoox-html.el: Use classes for caption instead of align
Vladimir Lomov [Sat, 28 Dec 2013 22:33:59 +0000 (07:33 +0900)]
ox-html.el: Use classes for caption instead of align

* ox-html.el (org-html-style-default): New classes
caption.t-above and caption.t-bottom.
(org-html-table): Use new classes.

Signed-off-by: Vladimir Lomov <>
3 years agoFix defcustoms: don't quote const values.
Bastien Guerry [Mon, 30 Dec 2013 09:30:44 +0000 (10:30 +0100)]
Fix defcustoms: don't quote const values.

* ob-latex.el (org-babel-latex-htlatex-packages): Use repeat
instead of list as the defcustom type.

* ox.el (org-export-with-creator):
* org.el (org-loop-over-headlines-in-active-region)
(org-mouse-1-follows-link, org-provide-todo-statistics):
* org-agenda.el (org-agenda-custom-commands-local-options)
(org-agenda-show-inherited-tags): Don't quote const values.

Thanks to Glenn Morris for reporting this.

3 years agoAdd missing :type to a few options.
Bastien Guerry [Mon, 30 Dec 2013 09:13:57 +0000 (10:13 +0100)]
Add missing :type to a few options.

* ox-texinfo.el (org-texinfo-def-table-markup):
* org-inlinetask.el (org-inlinetask-show-first-star):
* ob-maxima.el (org-babel-maxima-command): Add type.

Thanks to Glenn Morris for reporting this.

3 years agoBackport change from r115807 in Emacs trunk
Bastien Guerry [Mon, 30 Dec 2013 09:10:56 +0000 (10:10 +0100)]
Backport change from r115807 in Emacs trunk

3 years agoox: Fix smart quote detection
Nicolas Goaziou [Thu, 26 Dec 2013 11:35:59 +0000 (12:35 +0100)]
ox: Fix smart quote detection

* lisp/ox.el (org-export-smart-quotes-regexps): Fix smart quote
  detection when it is followed by an open parenthesis syntax class.

3 years agoSmall rewrite of the previous commit.
Bastien Guerry [Mon, 23 Dec 2013 05:58:26 +0000 (06:58 +0100)]
Small rewrite of the previous commit.

Use `regexp-opt' instead of `regexp-quote'.

3 years agoorg-habit.el (org-habit-parse-todo): Match all TODO keywords, not just "TODO"
Ted Wiles [Sun, 22 Dec 2013 23:10:44 +0000 (00:10 +0100)]
org-habit.el (org-habit-parse-todo): Match all TODO keywords, not just "TODO"

* org-habit.el (org-habit-parse-todo): Match all TODO
keywords, not just "TODO".


3 years agodoc/org.texi: Add #+BEGIN_ABSTRACT as example
Bastien Guerry [Sun, 22 Dec 2013 22:36:38 +0000 (23:36 +0100)]
doc/org.texi: Add #+BEGIN_ABSTRACT as example

* org.texi (Special blocks): Add #+BEGIN_ABSTRACT as another
(@LaTeX{} specific attributes): New index entries.  Use
#+BEGIN_ABSTRACT in the example.

3 years agoorg-table.el (org-table-fix-formulas): Handle multiple #+tblfm: lines
Bastien Guerry [Sun, 22 Dec 2013 09:09:53 +0000 (10:09 +0100)]
org-table.el (org-table-fix-formulas): Handle multiple #+tblfm: lines

* org-table.el (org-table-fix-formulas): Handle multiple
#+tblfm: lines.

Thanks to Daniel Gerber for reporting this problem.

3 years ago* (elpaplus-dirty elpaplus-up): Include htmlize.el.
Bastien Guerry [Sun, 22 Dec 2013 08:41:50 +0000 (09:41 +0100)]
* (elpaplus-dirty elpaplus-up): Include htmlize.el.

* (elpaplus-dirty elpaplus-up): Include htmlize.el
in org-plus-contrib ELPA package.

Thanks to Francesco Pizzolante for reporting this.

3 years ago* contrib/lisp/ob-oz.el (mozart): Don't throw an error
Bastien Guerry [Sun, 22 Dec 2013 08:25:58 +0000 (09:25 +0100)]
* contrib/lisp/ob-oz.el (mozart): Don't throw an error

* contrib/lisp/ob-oz.el (mozart): Don't throw an error if the
mozart library is not present in the load-path.

3 years agoorg-as-mac-chrome-get-frontmost-url: Fix to remove unneeded double quotes.
Alex Poslavsky [Sat, 21 Dec 2013 17:08:27 +0000 (19:08 +0200)]
org-as-mac-chrome-get-frontmost-url: Fix to remove unneeded double quotes.

* contrib/lisp/org-mac-link.el: Fix bug: remove double quotes.


Applescript returns the link and description in quotes like this:

[["][How to contribute to Org?"]]

The fix changes it to this:

[[][How to contribute to Org?]]

4 years agoox.el (org-export-to-file): Fix typo in docstring
Bastien Guerry [Wed, 18 Dec 2013 15:00:05 +0000 (16:00 +0100)]
ox.el (org-export-to-file): Fix typo in docstring

* ox.el (org-export-to-file): Fix typo in docstring.

4 years agoorg-element: Keep compatibility with Babel's regexps
Nicolas Goaziou [Mon, 16 Dec 2013 20:00:57 +0000 (21:00 +0100)]
org-element: Keep compatibility with Babel's regexps

* lisp/org-element.el (org-element-inline-babel-call-successor): Use
  original regexp to stay up-to-date with Babel changes.

4 years agoorg-element: Fix affiliated keyword regexp
Nicolas Goaziou [Sun, 15 Dec 2013 14:20:03 +0000 (15:20 +0100)]
org-element: Fix affiliated keyword regexp

* lisp/org-element.el (org-element--affiliated-re): Fix affiliated
  keyword regexp.

4 years agoox-org: Remove attr_backend keywords
Nicolas Goaziou [Sun, 15 Dec 2013 14:17:24 +0000 (15:17 +0100)]
ox-org: Remove attr_backend keywords

* lisp/ox-org.el (org-org-identity): Since back-end specific keywords
  are stripped from output, also remove attr_backend keywords.

4 years agoorg.texi: Document `org' back-end
Nicolas Goaziou [Sun, 15 Dec 2013 13:52:46 +0000 (14:52 +0100)]
org.texi: Document `org' back-end

* doc/org.texi (Org export): New section.
* lisp/ox-org.el: Remove initial code comments since this is now in

4 years agoorg.texi: Fix some whitespace errors
Nicolas Goaziou [Sun, 15 Dec 2013 10:54:22 +0000 (11:54 +0100)]
org.texi: Fix some whitespace errors

* doc/org.texi (HTML doctypes): Fix whitespace error.

4 years agoorg.texi: Add html related publishing options
Nicolas Goaziou [Sun, 15 Dec 2013 10:38:37 +0000 (11:38 +0100)]
org.texi: Add html related publishing options

* doc/org.texi (HTML doctypes): Fix display.
(Publishing options): Add missing html publishing options.

4 years agoFix bug when using both electric-pair-mode and delete-selection-mode
Bastien Guerry [Sat, 7 Dec 2013 07:17:33 +0000 (08:17 +0100)]
Fix bug when using both electric-pair-mode and delete-selection-mode

* org.el (org-self-insert-command)
(orgtbl-self-insert-command): Change the value of the
`delete-selection' property to allow other commands like
`electric-pair-will-use-region' to be run before deletion.

Thanks to Harald Hanche-Olsen for reporting this.

4 years agoob-exp: Fix duplicate evaluation with :wrap src
Nicolas Goaziou [Wed, 4 Dec 2013 22:23:33 +0000 (23:23 +0100)]
ob-exp: Fix duplicate evaluation with :wrap src

* lisp/ob-exp.el (org-babel-exp-process-buffer): Fix duplicate
  evaluation with :wrap src.
(org-babel-exp-non-block-elements): Removed function.
* testing/lisp/test-ob-lob.el (test-ob-lob/export-lob-lines): Fix test.

4 years agoorg-attach.el: Check whether git is installed
Bastien Guerry [Fri, 6 Dec 2013 14:22:50 +0000 (15:22 +0100)]
org-attach.el: Check whether git is installed

* org-attach.el (vc-git): Require.
(org-attach-commit): Check whether git is installed.

Thanks to Jonathan Leech-Pepin for reporting this.

4 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

4 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

4 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.

4 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.


4 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 <>
4 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 <>
4 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

4 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.

4 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

4 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

4 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.

4 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.


4 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

4 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

4 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.