6 years agoNew customization variable: Loop over headlines in active region
David Maus [Thu, 25 Aug 2011 04:25:32 +0000 (06:25 +0200)]
New customization variable: Loop over headlines in active region

* org.el (org-loop-over-headlines-in-active-region): New customization
variable. Loop over headlines in active region.
(org-schedule, org-deadline): Apply to headlines in region depending
on new customization variable.

6 years agoImmediately return if scope is 'region but no region is active
David Maus [Tue, 30 Aug 2011 04:29:29 +0000 (06:29 +0200)]
Immediately return if scope is 'region but no region is active

* org.el (org-map-entries): Immediately return if scope is 'region but
no region is active.

6 years agoExtend scope 'region to include entire body of last headline in active region
David Maus [Tue, 30 Aug 2011 04:22:12 +0000 (06:22 +0200)]
Extend scope 'region to include entire body of last headline in active region

* org.el (org-map-entries): Extend scope 'region to include
entire body of last headline in active region.

6 years agoob-calc.el: Remove (require 'calc-store).
Bastien Guerry [Sat, 22 Oct 2011 13:34:06 +0000 (15:34 +0200)]
ob-calc.el: Remove (require 'calc-store).

6 years agoob.el: Fix byte-compiler warning about free variable.
Bastien Guerry [Sat, 22 Oct 2011 13:28:01 +0000 (15:28 +0200)]
ob.el: Fix byte-compiler warning about free variable.

6 years ago* org-src.el (org-edit-src-code): Fix typo-bug.
Bastien Guerry [Sat, 22 Oct 2011 13:26:36 +0000 (15:26 +0200)]
* org-src.el (org-edit-src-code): Fix typo-bug.

This is leftover from Tassilo's previous patch applied today.

6 years agoRename `org-format-agenda-item' to `org-agenda-format-item'.
Bastien Guerry [Sat, 22 Oct 2011 13:08:33 +0000 (15:08 +0200)]
Rename `org-format-agenda-item' to `org-agenda-format-item'.

* org.el (org-format-agenda-item, org-scan-tags): Rename
`org-format-agenda-item' to `org-agenda-format-item'.

* org-agenda.el (org-search-view)
(org-get-entries-from-diary, org-agenda-get-todos)
(org-agenda-get-timestamps, org-agenda-get-sexps)
(org-agenda-get-progress, org-agenda-get-deadlines)
(org-agenda-get-scheduled, org-agenda-get-blocks)
(org-agenda-format-item, org-agenda-add-time-grid-maybe)
(org-agenda-add-entry-to-org-agenda-diary-file): Rename
`org-format-agenda-item' to `org-agenda-format-item'.

Using the `org-agenda-' prefix makes more sense here.

6 years agoSilent byte-compiler about `category-pos'.
Bastien Guerry [Sat, 22 Oct 2011 13:04:33 +0000 (15:04 +0200)]
Silent byte-compiler about `category-pos'.

* org-agenda.el: Replace `category-pos' by `org-category-pos'
to silent byte-compiler.

6 years ago* org.el: Declare external function `cdlatex-compute-tables'.
Bastien Guerry [Sat, 22 Oct 2011 13:01:02 +0000 (15:01 +0200)]
* org.el: Declare external function `cdlatex-compute-tables'.

* org.el (cdlatex-compute-tables): Declare external function

6 years agoorg-latex.el: Fix problem when matching #+LaTeX_CLASS.
Bastien Guerry [Sat, 22 Oct 2011 10:07:43 +0000 (12:07 +0200)]
org-latex.el: Fix problem when matching #+LaTeX_CLASS.

* org-latex.el: (org-export-latex-set-initial-vars): Fix problem when
  matching #+LaTeX_CLASS.

Thanks to Torsten Wagner for spotting this.

6 years agoAdded trac-wiki and tikiwiki export settings.
Robert P. Goldman [Fri, 21 Oct 2011 21:13:26 +0000 (21:13 +0000)]
Added trac-wiki and tikiwiki export settings.

6 years agobind org-export-current-backend in generic exporter.
Robert P. Goldman [Fri, 21 Oct 2011 21:13:25 +0000 (21:13 +0000)]
bind org-export-current-backend in generic exporter.

This is needed for org-export-preprocess-string to function correctly.

6 years agoReplace org-mode-p with usual (eq major-mode 'org-mode) check
Tassilo Horn [Tue, 11 Oct 2011 07:07:27 +0000 (09:07 +0200)]
Replace org-mode-p with usual (eq major-mode 'org-mode) check

Additionally, replace one

  (or (org-mode-p) (derived-mode-p 'org-mode))


  (derived-mode-p 'org-mode)

cause that is reflexive anyway (returns true, if the current mode is

Delete one check testing for org-mode or org derived mode

6 years agoAccurate description of info hyperlink format
Rafael Laboissiere [Mon, 10 Oct 2011 23:15:37 +0000 (01:15 +0200)]
Accurate description of info hyperlink format

Hyperlinks in the form "info:file#node" work with plain spaces in the
"node" part and do not need to have spaces encoded as %20.  This is
the case for me, who is using the Debian emacs-snapshot package,
version 20110926-1.


6 years agoAdd footnote on how the hyperlink text is searched in Org files
Rafael Laboissiere [Mon, 10 Oct 2011 22:58:36 +0000 (00:58 +0200)]
Add footnote on how the hyperlink text is searched in Org files

* org.texi (External links): Add footnote on how the behavior of the
text search in Org files are controled by the variable

This change is necessary in order to avoid misleading the user as
regards of the behavior of the search, in particular because the
default value of org-link-search-must-match-exact-headline is


6 years agoFix typos in variable description
Rafael Laboissiere [Mon, 10 Oct 2011 22:22:09 +0000 (00:22 +0200)]
Fix typos in variable description

* lisp/org.el (org-link-search-must-match-exact-headline): Fix typos.


6 years agoorg-latex.el (org-export-latex-make-header): Add some hyperref options.
Bastien Guerry [Sat, 22 Oct 2011 09:05:28 +0000 (11:05 +0200)]
org-latex.el (org-export-latex-make-header): Add some hyperref options.

* org-latex.el (org-export-latex-make-header): Add some hyperref

Thanks to Mikhail Titov for a preliminary version of this patch.

6 years agoVariable publishing-directory? (resent with patch as attachment)
Kai Tetzlaff [Thu, 18 Aug 2011 13:17:56 +0000 (13:17 +0000)]
Variable publishing-directory? (resent with patch as attachment)

Bastien <> writes:

Hi Bastien,

> The patch looks good but I'd like to understand it better.
> Can you send an example configuration working with your patch?

In org-publish-project-alist, i have HTML publishing projects which
should be published to different target directories depending on e.g.
where emacs is running (which i determine in my init files using the MAC
address of the default GW, the name the machine, ...).

Here is an example: At home, i publish to a local directory
(:publishing-directory "~/tmp/publish-test") but at work i would like to
publish directly to a webserver (:publishing-directory
"/plinkx:doxydoc:~/public_html/publish-test" - this is on w32, using
tramps PuTTY/plink). To avoid having to change the definition of the
publishing project when i change locations i would like to construct the
actual value of :publishing-directory by calling a function:

         :base-directory "~/Documents/Work/RS"
         :recursive t
         :base-extension "org"
         :exclude-tags ("intern")
         :publishing-directory '(expand-file-name "publish-test" kt:org-default-publishing-dir)
         :publishing-function org-publish-org-to-html)

Depending on the location i'm in, 'kt:org-default-publishing-dir' would
be set to either "~/tmp" or "/plinkx:doxydoc:~/public_html". Without the
patch, the example above does not work as the value of
:publishing-directory does not get evaluated.

> Also, please try to send git patch using these conventions:
> Thanks a lot!

Thanks for the hint. I've attached a revised version of the patch which
includes a changelog/commit msg - i hope that works for you.

Publish: allow dynamic construction of the publish destination.

* org-publish.el (org-publish-file): Added 'eval'ing the value of the
 :publishing-directory property before using it as destination of the
 publishing project. This allows to construct the publish destination
 directory dynamically at run-time using the return value of a


6 years agoorg-agenda.el (org-agenda-list-stuck-projects): Fix tiny bug.
Bastien Guerry [Sat, 22 Oct 2011 08:13:11 +0000 (10:13 +0200)]
org-agenda.el (org-agenda-list-stuck-projects): Fix tiny bug.

* org-agenda.el (org-agenda-list-stuck-projects): Fix tiny bug.

This bug was introduced by a typo in Michael's patch for XEmacs

6 years agoAgenda: Add missing option, document time stamp movement to future
Carsten Dominik [Sat, 22 Oct 2011 06:31:18 +0000 (08:31 +0200)]
Agenda: Add missing option, document time stamp movement to future

* lisp/org-agenda.el (org-agenda-move-date-from-past-immediately-to-today):
New option.
(org-agenda-date-later): Improve the logical structure.

* doc/org.texi (Agenda commands): Document that S-right on a line
representing a past date will immediately shift that date to today.

6 years agoMerge branch 'master' of
Carsten Dominik [Fri, 21 Oct 2011 21:32:35 +0000 (23:32 +0200)]
Merge branch 'master' of

6 years agoMaintain XEmacs compatibility
Carsten Dominik [Fri, 21 Oct 2011 20:36:53 +0000 (22:36 +0200)]
Maintain XEmacs compatibility

* lisp/ob-calc.el (featurep): Require calc-store.
* lisp/org-agenda.el (org-agenda-list-stuck-projects): Fix regexp
special handling.
* lisp/org-compat.el (fboundp): Support for XEmacs.
* lisp/org-exp.el (org-export): Protect XEmacs from `(redisplay)' call.
* lisp/org-footnote.el (org-footnote-re): Optimize macro processing.
* lisp/org.el (org-set-autofill-regexps): Xemacs compatibility.

Patch by Michael Sperber, checked and slightly modified by Carsten.

6 years agotwo more quick fixes
Eric Schulte [Fri, 21 Oct 2011 17:35:41 +0000 (11:35 -0600)]
two more quick fixes

* lisp/ob.el (org-babel-balanced-split): Balance both [] and ()
  (org-babel-parse-header-arguments): Be sure to replace removed ":"

6 years agoquick fix for a tiny bug
Eric Schulte [Fri, 21 Oct 2011 17:21:39 +0000 (11:21 -0600)]
quick fix for a tiny bug

* lisp/ob.el (org-babel-parse-header-arguments): Quick fix for a tiny bug.

6 years agoNow allow multiple "var" specifications behind a single ":var"
Eric Schulte [Fri, 21 Oct 2011 17:15:06 +0000 (11:15 -0600)]
Now allow multiple "var" specifications behind a single ":var"

* lisp/ob.el (org-babel-params-from-properties): Now splits multiple
  var arguments behind a single ":var".
  (org-babel-balanced-split): Separated balanced splitting of strings
  out into a new function.
  (org-babel-parse-multiple-vars): Splits multiple var arguments
  behind a single ":var".

6 years agoMerge branch 'master' of
Bastien Guerry [Fri, 21 Oct 2011 15:57:40 +0000 (17:57 +0200)]
Merge branch 'master' of

6 years agoorg.el: Enable recursive minibuffers in `org-completing-read'.
Bastien Guerry [Fri, 21 Oct 2011 15:46:37 +0000 (17:46 +0200)]
org.el: Enable recursive minibuffers in `org-completing-read'.

org.el: (org-completing-read): Enable recursive minibuffers and add
the `C-c !' key in the minibuffer local map.

Thanks to Skip Collins for the idea and to Nick Dokos for the

6 years agoMerge branch 'master' of
Carsten Dominik [Fri, 21 Oct 2011 14:58:01 +0000 (16:58 +0200)]
Merge branch 'master' of

6 years agoorg.el: Remap `outline-promote' and `outline-demote' keys.
Bastien Guerry [Fri, 21 Oct 2011 14:21:49 +0000 (16:21 +0200)]
org.el: Remap `outline-promote' and `outline-demote' keys.

* org.el: Remap `outline-promote' and `outline-demote' keys to
`org-promote-subtree' and `org-demote-subtree'.

Thanks to Michael Brand for the suggestion.

6 years agoCheck if marker is valid before use
Leo [Fri, 21 Oct 2011 00:56:31 +0000 (00:56 +0000)]
Check if marker is valid before use

* lisp/org-agenda.el (org-agenda-do-context-action): Check if marker
is valid before use.

6 years agoFix shifting of data ranges.
Carsten Dominik [Fri, 21 Oct 2011 08:07:02 +0000 (10:07 +0200)]
Fix shifting of data ranges.

* lisp/org-agenda.el (org-agenda-date-later): Fix shifting of date ranges.

Patch based on code by Niels Giesen.

6 years agoUpdate documentation to reflect removal of #+PROPERTIES
Eric Schulte [Thu, 20 Oct 2011 21:30:07 +0000 (15:30 -0600)]
Update documentation to reflect removal of #+PROPERTIES

* doc/org.texi (Buffer-wide header arguments): Update documentation to
  reflect removal of #+PROPERTIES.

6 years agoremoving `org-babel-params-from-buffer' and #+PROPERTIES: entirely
Eric Schulte [Thu, 20 Oct 2011 21:26:43 +0000 (15:26 -0600)]
removing `org-babel-params-from-buffer' and #+PROPERTIES: entirely

* lisp/ob.el: Removing `org-babel-params-from-buffer' and
  #+PROPERTIES: entirely.
* lisp/ob-exp.el (org-babel-exp-src-block): Removing
  `org-babel-params-from-buffer' and #+PROPERTIES: entirely.
* lisp/ob-lob.el (org-babel-lob-execute): Removing
  `org-babel-params-from-buffer' and #+PROPERTIES: entirely.

6 years agoremoving #+BABEL: lines in favor of general #+PROPERTIES: lines
Eric Schulte [Thu, 20 Oct 2011 19:31:20 +0000 (13:31 -0600)]
removing #+BABEL: lines in favor of general #+PROPERTIES: lines

* lisp/ob.el (org-babel-params-from-buffer): Removing #+BABEL: lines
  in favor of general #+PROPERTIES: lines.

* doc/org.texi (Buffer-wide header arguments): Removing documentation
  of the defunct #+BABEL: structure.

6 years agoUpdate default value of org-export-odt-table-styles
Jambunathan K [Thu, 20 Oct 2011 08:57:42 +0000 (14:27 +0530)]
Update default value of  org-export-odt-table-styles

* contrib/lisp/org-odt.el (org-export-odt-table-styles): Add
the required table style "OrgEquation".

Continues the following commit:
| commit 861ecb85baf0467610bb6bbdfa985a2f4adaa795
| Author: Jambunathan K <>
| Date:   Sun Sep 18 00:09:06 2011 +0530
| contrib/lisp/org-odt.el: Typeset display equations using tables

6 years agoOrgOdtContentTemplate.xml: Added custom table styles
Jambunathan K [Thu, 20 Oct 2011 08:27:53 +0000 (13:57 +0530)]
OrgOdtContentTemplate.xml: Added custom table styles

* contrib/odt/styles/OrgOdtContentTemplate.xml: Added styles
for working with applying table templates.

The exporter with it's factory settings doesn't depend on the
availability of these styles for formatting - i.e., these
styles should ideally be created by the user himself depending
on his tastes.  However considering the complexity & verbosity
of these styles these have been included to:
- illustrate how the table templating facilitites can be
  exploited by the user
- enable unit-testing of table template changes

Complements the following commit:
| commit e73bca63cf658f8cb659ab6d00e4e93afaba8b42
| Author: Jambunathan K <>
| Date:   Tue Sep 13 19:37:13 2011 +0530
| org-odt.el: Support for styling of tables using table templates

6 years agoMerge branch 'master' of
Carsten Dominik [Thu, 20 Oct 2011 07:39:30 +0000 (09:39 +0200)]
Merge branch 'master' of

6 years agoob-sql: insert into a temporary buffer
Eric Schulte [Wed, 19 Oct 2011 18:07:39 +0000 (12:07 -0600)]
ob-sql: insert into a temporary buffer

* lisp/ob-sql.el (org-babel-execute:sql): Insert into a temporary

6 years agoorg-mime: use dvipng for inline images when export to html mail
Eric Schulte [Wed, 19 Oct 2011 14:29:03 +0000 (08:29 -0600)]
org-mime: use dvipng for inline images when export to html mail

* contrib/lisp/org-mime.el (org-mime-htmlize): Use dvipng for inline
  images when export to html mail.

6 years agoAdd a new option #+ODT_STYLES_FILE:...
Jambunathan K [Wed, 19 Oct 2011 17:42:43 +0000 (23:12 +0530)]
Add a new option #+ODT_STYLES_FILE:...

* contrib/lisp/org-odt.el: Introduce a new option
"#+ODT_STYLES_FILE: ..." for per-file setting of
(org-export-odt-styles-file): Mention above option in
(org-odt-save-as-outfile): Honor above option.

6 years agoMake sure cdlatex customization is taken into account properly
Carsten Dominik [Wed, 19 Oct 2011 16:56:13 +0000 (18:56 +0200)]
Make sure cdlatex customization is taken into account properly

* lisp/org.el (org-cdlatex-mode): Run cdlatex-mode-hook and update
the internal cdlatex tables.

6 years agoFix a crash in org-odt-is-formula-link-p
Jambunathan K [Wed, 19 Oct 2011 16:46:59 +0000 (22:16 +0530)]
Fix a crash in org-odt-is-formula-link-p

* contrib/lisp/org-odt.el (org-odt-is-formula-link-p): Trivial
change to avoid a crash.

6 years agoob-sql returns literal results when requested
Eric Schulte [Tue, 18 Oct 2011 16:15:04 +0000 (10:15 -0600)]
ob-sql returns literal results when requested

* lisp/ob-sql.el (org-babel-execute:sql): Respect literal-results options.

6 years agofix multi-table bug in code block colname and rowname handling
Eric Schulte [Tue, 18 Oct 2011 16:08:39 +0000 (10:08 -0600)]
fix multi-table bug in code block colname and rowname handling

  Thanks to Nick Dokos for suggesting this fix

* lisp/ob.el (org-babel-disassemble-tables): Fix multi-table bug in
  code block colname and rowname handling.

6 years agoorg-odt.el: Don't corrupt styles.xml while applying outline numbering
Jambunathan K [Tue, 18 Oct 2011 11:25:27 +0000 (16:55 +0530)]
org-odt.el: Don't corrupt styles.xml while applying outline numbering

* contrib/lisp/org-odt.el
(org-odt-configure-outline-numbering): Tighten the regular
expression that matches "<text:outline-level-style ...>"

Fixes bug reported here

6 years agoFix Emacs 24 compatibility issue with Emacs 24
Tassilo Horn [Thu, 13 Oct 2011 20:05:43 +0000 (20:05 +0000)]
Fix Emacs 24 compatibility issue with Emacs 24

* contrib/lisp/org-contacts.el (completion-table-case-fold): Make
completion compatible with Emacs 24Fix org-contacts completion at point (was: org-contacts completion stopped working)

julien Barnier <> writes:

Hi Julien,

>> I use a very recent emacs 24 bzr checkout and org master from git.
>> Not sure who's the culprit.
> Same problem here. After a quick look it seems that there has been a
> recent change in the arguments taken by the completion-table-case-fold
> function in minibuffer.el :

Thanks for the pointer!

> But I don't think I could be able to find a fix by myself.

But I was able, so good teamwork, mate. :-)

--8<---------------cut here---------------start------------->8---
>From d89ca3ce39cd7436e5205744adcf468d9619180f Mon Sep 17 00:00:00 2001
From: Tassilo Horn <>
Date: Thu, 13 Oct 2011 17:02:07 +0200
Subject: [PATCH 2/2] Fix org-contacts completion at point.

6 years agoFix bug in regexp for #+include
Carsten Dominik [Sun, 16 Oct 2011 18:00:23 +0000 (20:00 +0200)]
Fix bug in regexp for #+include

* lisp/org-publish.el (org-publish-cache-file-needs-publishing): Fix regexp
to not inlcude newlines.

6 years agoKeep byte compiler happy
Carsten Dominik [Sun, 16 Oct 2011 14:54:52 +0000 (16:54 +0200)]
Keep byte compiler happy

6 years agoFix parenthesis error
Carsten Dominik [Sun, 16 Oct 2011 14:51:13 +0000 (16:51 +0200)]
Fix parenthesis error

6 years agoRemove table overlays before restart
Carsten Dominik [Sun, 16 Oct 2011 11:38:48 +0000 (13:38 +0200)]
Remove table overlays before restart

* lisp/org.el (org-ctrl-c-ctrl-c): Remove table overlays before restart.

6 years agoMatch entities before number, so that \sim2 is fontified correctly
Carsten Dominik [Sun, 16 Oct 2011 11:23:02 +0000 (13:23 +0200)]
Match entities before number, so that \sim2 is fontified correctly

* lisp/org.el (org-fontify-entities): Match entities before numbers, as in

6 years agoDoc: Document that trees tagged with ARCHIVE still contribute to clocktable
Carsten Dominik [Sun, 16 Oct 2011 11:12:26 +0000 (13:12 +0200)]
Doc: Document that trees tagged with ARCHIVE still contribute to clocktable

* doc/org.texi (The clock table): Mention that ACHIVED trees contribute
to the clock table.

6 years agoAgenda: New behaviour when shifting scheduled date forward.
Carsten Dominik [Sat, 15 Oct 2011 21:37:59 +0000 (23:37 +0200)]
Agenda: New behaviour when shifting scheduled date forward.

* lisp/org-agenda.el (org-agenda-date-later): Make pushing forward
a past date to jump immedialtely to today.

6 years agoMove some of the new defcustoms to the customization section
Carsten Dominik [Sun, 16 Oct 2011 08:57:21 +0000 (10:57 +0200)]
Move some of the new defcustoms to the customization section

6 years agoPut table style and col sizes under direct user control
Carsten Dominik [Sun, 16 Oct 2011 08:55:28 +0000 (10:55 +0200)]
Put table style and col sizes under direct user control

* contrib/lisp/org-lparse.el
(org-lparse-table-get-colalign-info): Renamed
`org-forced-aligns' to `org-col-cookies'.  Renamed local
variable `forced-aligns' to `col-cookies'.
(org-lparse-format-table-row): With the introduction of
`org-col-cookies' property the internal structure of
`org-lparse-table-colalign-info' has changed.  Do the right
thing while setting up col alignment.  Pass on the colwidth
property as horiz-span arg of `TABLE-CELL' callback.

* contrib/lisp/org-odt.el (org-odt-begin-table): Let the table
style be settable throught #+ATTR_ODT line.  By default tables
are configured to occupy 90% of paper width.  This is too big
for smaller tables.  For aesthetic reasons, a user might
prefer that such tables of shorter width and thus specify a
different style.
(org-odt-end-table, org-odt-format-table-cell): Honor colwidth

* contrib/lisp/org-xhtml.el (org-xhtml-format-table-cell): Fix
signature as mandated by changes in TABLE-CELL callback.

See comments in the earlier patch. See also

6 years agoParse and store both col align and col width spec for later use
Carsten Dominik [Sun, 16 Oct 2011 08:54:20 +0000 (10:54 +0200)]
Parse and store both col align and col width spec for later use

* lisp/org-exp.el (org-store-forced-table-alignment): Parse
the column cookie for both alignment and width specification.
Store the resulting value in `org-col-cookies' property.
Retire the previously used `org-forced-aligns' property for
consistency.  Renamed local variable `aligns' to `cookies'.
* lisp/org-html.el (org-format-org-table-html): Use
`org-col-cookies'.  Renamed local variable forced-aligns to

This is a preparatory patch.  A backend can look at the colwidth
specification and (at it's discretion) use it to control relative
sizes of individual columns in a table.  At this moment, it is unclear
whether the widths used to control the display of table in Org buffer
can be overloaded to also control the formatting of table in a

Refer following discussion with Matt Price:

6 years agoAdd support for LaTeX to MathML conversion
Carsten Dominik [Sun, 16 Oct 2011 08:52:32 +0000 (10:52 +0200)]
Add support for LaTeX to MathML conversion

* lisp/org.el (org-latex-to-mathml-jar-file)
(org-latex-to-mathml-convert-command): New user-customizable
(org-format-latex-mathml-available-p, org-create-math-formula)
(org-format-latex-as-mathml): New functions.
(org-format-latex): Add a new local variable block-type that
notes the nature of the equation - inline or display.
Associate it's value to `org-latex-src-embed-type' property of
dvipng links.  Add mathml as new processing type.

Patch by Jambunathan.

6 years agoRebase: Add tree name to prompt
Sébastien Vauban [Fri, 14 Oct 2011 13:25:14 +0000 (13:25 +0000)]
Rebase: Add tree name to prompt

* lisp/org.el (org-refile): Add tree name to prompt.

6 years agoMake it possible to place table captions below the table
Carsten Dominik [Mon, 10 Oct 2011 19:05:03 +0000 (21:05 +0200)]
Make it possible to place table captions below the table

* lisp/org-latex.el (org-export-latex-tables): Honor
(org-export-latex-table-caption-above): New option.

Patch by Thomas Dye.

6 years agoorg-odt.el: Treat label resolution failures as soft error
Jambunathan K [Mon, 10 Oct 2011 10:55:08 +0000 (16:25 +0530)]
org-odt.el: Treat label resolution failures as soft error

* contrib/lisp/org-odt.el (org-odt-get-label-definition): If a
label cannot be resolved, issue a warning and return nil.
(org-odt-fixup-label-references): Nothing to fixup if a
referenced label is not seen by the odt exporter.

6 years agoorg-odt.el: Abort export if the label referenced is not defined
Jambunathan K [Mon, 10 Oct 2011 08:57:14 +0000 (14:27 +0530)]
org-odt.el: Abort export if the label referenced is not defined

* contrib/lisp/org-odt.el (org-odt-get-label-definition):
Throw an error if the label that is being referenced is not
defined elsewhere.

6 years agoRevert "org-odt.el: Remove dependency on a pending patch"
Jambunathan K [Sun, 9 Oct 2011 16:53:11 +0000 (22:23 +0530)]
Revert "org-odt.el: Remove dependency on a pending patch"

This reverts commit 13b4f6b2e06a76a52ff006e0a9960c4dcac79087.

6 years agonow including language specific header arg values in insertion options
Eric Schulte [Sun, 9 Oct 2011 15:31:32 +0000 (09:31 -0600)]
now including language specific header arg values in insertion options

* lisp/ob.el (org-babel-insert-header-arg): Now including language
  specific header arg values in insertion options.

6 years agoFixed typo in org-babel-insert-header-arg.
Eric Schulte [Sun, 9 Oct 2011 15:11:00 +0000 (09:11 -0600)]
Fixed typo in org-babel-insert-header-arg.

  Thanks to Torsten Wagner for pointing this out and for suggesting
  the original feature.

* lisp/ob.el (org-babel-insert-header-arg): Fixed typo.

6 years agoMerge branch 'master' of
Carsten Dominik [Sun, 9 Oct 2011 11:17:58 +0000 (13:17 +0200)]
Merge branch 'master' of

6 years agoorg-odt help
Jambunathan K [Tue, 4 Oct 2011 23:29:04 +0000 (23:29 +0000)]
org-odt help

> I would like to submit 2 more patches - one to the manual and other to
> org-exp.el.

I am attaching the promised patch to org-exp.el. Can someone review and
commit this change?

Please note that I have withheld the changes to org-odt & co which make
use of this change.

ps: The patch to org.texi will follow soon - maybe in a day or two.

>From 39ab2a263336ba077c7cd6627a3203c55c5bddba Mon Sep 17 00:00:00 2001
From: Jambunathan K <>
Date: Tue, 4 Oct 2011 23:32:35 +0530
Subject: [PATCH] org-exp.el: Enhance `org-export-number-lines' to support odt export

* lisp/org-exp.el (org-export-number-lines): Modified.  Add a
new parameter `preprocess' and use this for backend-agnostic
handling of literal examples.

This parameter is currently exercised only by the odt exporter.  Hint:
See future commits.

6 years agoorg-lparse.el: Remove unecessary link unescape
David Maus [Sun, 11 Sep 2011 14:57:01 +0000 (16:57 +0200)]
org-lparse.el: Remove unecessary link unescape

* contrib/lisp/org-lparse.el (org-lparse-format-org-link): Remove unecessary
link unescape.

6 years agoAllow subscripts and superscripts to start at bol
Nicolas Goaziou [Sun, 9 Oct 2011 07:34:47 +0000 (09:34 +0200)]
Allow subscripts and superscripts to start at bol

* lisp/org.el (org-match-substring-regexp,
  org-match-substring-with-braces-regexp): Allow subscripts and
  superscripts to start at beginning of line.

6 years agobinding new code block header argument helper function to C-c C-v h
Eric Schulte [Sat, 8 Oct 2011 22:35:17 +0000 (16:35 -0600)]
binding new code block header argument helper function to C-c C-v h

6 years agoNew helper function for inserting common code block header arguments
Eric Schulte [Sat, 8 Oct 2011 22:31:50 +0000 (16:31 -0600)]
New helper function for inserting common code block header arguments

* lisp/ob.el (org-babel-common-header-args-w-values): New variable to
  hold common header arguments and their default values.
  (org-babel-header-arg-names): Redefined using the new common header
  arg variable.
  (org-babel-insert-header-arg): New function to help when inserting
  header arguments.

6 years agoRemove unnecessary protection markers
David Maus [Sat, 8 Oct 2011 19:18:57 +0000 (21:18 +0200)]
Remove unnecessary protection markers

* org-html.el (org-html-handle-links): Remove unnecessary protection
markers when publishing link in default format.

Left-over from the mess that was 7.5's HTML export.

6 years agoManual: Better yasnippet config info
Carsten Dominik [Sat, 8 Oct 2011 16:32:16 +0000 (18:32 +0200)]
Manual: Better yasnippet config info

* doc/org.texi (Conflicts): Better yasnippet config info

Patch by Sylvain Rousseau.

6 years agoorg-crypt: when running `org-decrypt-entry', only run `auto-save-mode' check if on...
Pieter Praet [Sun, 28 Aug 2011 18:46:47 +0000 (18:46 +0000)]
org-crypt: when running `org-decrypt-entry', only run `auto-save-mode' check if on an encrypted entry

* lisp/org-crypt.el (org-crypt-check-auto-save): New function, see next change.
* lisp/org-crypt.el (org-decrypt-entry): Break the auto-save-mode check out
  into a separate function, and call it at a later point, to assure it only
  runs when visiting an encrypted entry.

Currently `org-decrypt-entry' is doing the auto-save-mode check whenever
it's run, regardless of context, while this only makes sense when run on
an entry which is actually encrypted (or looks like it, at least).


6 years agoShort timestamp in org-log-note-headings
John J Foerch [Fri, 7 Oct 2011 21:15:36 +0000 (21:15 +0000)]
Short timestamp in org-log-note-headings

Two new format codes support insertion of a short-format time stamp.
%d for an inactive time stamp, and %D for an active one.

* lisp/org.el (org-log-note-headings): Document new %d and %D escapes.
(org-store-log-note): Implement new %d and %D escapes.


6 years agoContinue numbering from any previous numbered snippet with +n, even when previous...
niels giesen [Fri, 16 Sep 2011 20:32:38 +0000 (20:32 +0000)]
Continue numbering from any previous numbered snippet with +n, even when previous numbered snippet does not immediately precede it.

* org-mode/lisp/org-exp.el (org-export-number-lines):

  Check whether number parameter (this is a numbered block!) is
  non-nil as well as whether cont is nil (this numbered block should
  *not* continue numbering where we left off before!) before resetting
  the count to zero.

  From the docs:

    If you use a `+n' switch, the numbering from the previous
    numbered snippet will be continued in the current one.

  With this change I believe the code complies with the docs.

6 years agoMerge branch 'master' of
Carsten Dominik [Sat, 8 Oct 2011 07:02:36 +0000 (09:02 +0200)]
Merge branch 'master' of

6 years agoAdd indirect agenda follow mode
Dave Abrahams [Sat, 24 Sep 2011 19:21:53 +0000 (15:21 -0400)]
Add indirect agenda follow mode

* lisp/org-agenda.el (org-agenda-follow-indirect): New option.
(org-agenda-follow-mode): Call `org-agenda-do-context-action' fro
follow mode.
(org-agenda-do-context-action): Also do indirect follow mode action.

By setting `org-agenda-follow-indirect' to a non-nil value,
`org-agenda-follow-mode' will use an indirect buffer to display only
the current item, rather than the whole agenda file in which it lives

6 years agofix typo in new sbe specification
Eric Schulte [Fri, 7 Oct 2011 18:22:04 +0000 (12:22 -0600)]
fix typo in new sbe specification

* lisp/ob-table.el (sbe): Fix typo in new sbe specification.

6 years agosbe now allows specification of header arguments
Eric Schulte [Fri, 7 Oct 2011 18:16:33 +0000 (12:16 -0600)]
sbe now allows specification of header arguments

* lisp/ob-table.el (sbe): If first variable is a string and not a cons
  cell, then interpret it as a string of header arguments to be passed
  to the code block.

6 years agoob-shen: fix build error
Eric Schulte [Fri, 7 Oct 2011 15:09:44 +0000 (09:09 -0600)]
ob-shen: fix build error

* lisp/ob-shen.el (shen-eval-defun): Declare external function.
  (org-babel-execute:shen): Move requirement of inf-shen into the
  function in which it is used to fix build error.

6 years agoorg-odt.el: Add bottom margin to source or example blocks
Jambunathan K [Fri, 7 Oct 2011 13:32:04 +0000 (19:02 +0530)]
org-odt.el: Add bottom margin to source or example blocks

* contrib/odt/styles/OrgOdtStyles.xml
(OrgFixedWidthBlockLastLine, OrgSrcBlockLastLine): New styles
to be applied to the last line of the source or example

* contrib/lisp/org-odt.el
(org-odt-format-source-code-or-example-colored): Use above

6 years agoorg-odt.el: Remove dependency on a pending patch
Jambunathan K [Fri, 7 Oct 2011 10:59:40 +0000 (16:29 +0530)]
org-odt.el: Remove dependency on a pending patch

Revert this commmit once the patch referenced below is accepted.

6 years agoorg-odt.el: Add support for native numbering of src and example lines
Jambunathan K [Fri, 7 Oct 2011 09:24:17 +0000 (14:54 +0530)]
org-odt.el: Add support for native numbering of src and example lines

* contrib/lisp/org-lparse.el (org-lparse-format-org-link):
Push the responsibility of calling
`org-export-get-coderef-format' to the backends.

* contrib/lisp/org-xhtml.el (org-xhtml-format-org-link): Take
up the above responsibility.

* contrib/lisp/org-odt.el (org-odt-format-link): Handle links whose
descriptions are actually line-numbers.
(org-odt-format-source-line-with-line-number-and-label): New.
Generate line numbers and link targets for lines that are part of
source or example blocks.
(org-odt-format-source-code-or-example-colored): Use
(org-odt-format-source-code-or-example): Pre-process input lines with
`org-export-number-lines'.  Also handle numbering of src lines.
(org-odt-format-org-link): Rework handling of coderef links.  Generate
ODF-specific markup for line-number based coderef links.
(org-xml-encode-plain-text-lines): Removed.  Not used any more.

contrib/odt/styles/OrgOdtStyles.xml (OrgSrcBlockNumberedLine): New
style for automatic numbering of src and example lines.

6 years agoadding initial support for evaluation of shen code blocks
Eric Schulte [Fri, 7 Oct 2011 01:54:22 +0000 (19:54 -0600)]
adding initial support for evaluation of shen code blocks

6 years agoMake org-open-at-point only ask once whether new header should be created
Carsten Dominik [Thu, 6 Oct 2011 08:53:31 +0000 (10:53 +0200)]
Make org-open-at-point only ask once whether new header should be created

* lisp/org.el (org-open-at-point): Make org-open-at-point only ask once
about creating a new headline

When following "thisfile" links org-open-at-point is kind enough to
retry org-link-search again after widening the buffer it can't be
found. However org-link-search also asks the question "No match -
create this as a new heading? (y or n)" when target can't be
found. This means that the question is asked twice when following a
nonexistent link and answering no.

This is fixed by setting org-link-search-inhibit-query in first try,
so only second invocation asks the question.


Patch by Anders Waldenborg

6 years agocontrib/lisp/org-elisp-symbol: Set type if symbol is defuned but not fbound
David Maus [Sun, 25 Sep 2011 21:21:40 +0000 (21:21 +0000)]
contrib/lisp/org-elisp-symbol: Set type if symbol is defuned but not fbound

Another small patch for org-elisp-symbol: Set the symbol type to
"Function or command" if it is defuned but not fbound when
`org-elisp-symbol-store-link' is called.

  -- David

6 years agoBug: org-refile-targets doesn't say whether it's AND or OR [7.7 (release_7.7.351...
Nick Dokos [Thu, 29 Sep 2011 08:59:14 +0000 (08:59 +0000)]
Bug: org-refile-targets doesn't say whether it's AND or OR [7.7 (release_7.7.351.gb8b5)]

Dave Abrahams <> wrote:

> I would change the doc for org-refile-targets to say that the resulting
> list of targets is the union of all the targets matched by each cons
> cell.  I think you could take that pretty much verbatim.

How's this?


>From f853b04fb474493b3b7b8857794c9f120c5f7822 Mon Sep 17 00:00:00 2001
From: Nick Dokos <>
Date: Wed, 28 Sep 2011 23:49:13 -0400
Subject: [PATCH] Amplify the doc for org-refile-targets

* lisp/org.el: (org-refile-targets) Elaborated the documentation of
               the variable as suggested by Dave Abrahams.


6 years agoAllow dashes and underscores in bibtex citation keys
Carsten Dominik [Thu, 6 Oct 2011 08:10:47 +0000 (10:10 +0200)]
Allow dashes and underscores in bibtex citation keys

* contrib/lisp/org-exp-bibtex.el (org-export-bibtex-preprocess): Allow
dashes and underscores in bibtex citation keys.


Patch by Nik Putnam

6 years agoBugfix for alignment of tag next to header name
Carsten Dominik [Thu, 6 Oct 2011 07:44:08 +0000 (09:44 +0200)]
Bugfix for alignment of tag next to header name

* lisp/org.el (org-align-tags-here): Allow tags to be placed right
after heading.
(org-tags-column): Document the meaning of tags column 0.

Patch by Michael Brand.


6 years agoTime range end in agenda view not displayed
niels giesen [Fri, 30 Sep 2011 19:41:35 +0000 (19:41 +0000)]
Time range end in agenda view not displayed

Giovanni Ridolfi <> writes:

> michael holzer <> writes:
>> When I have an entry that contains a time range, for example:
>> * timerange
>>   <2011-09-30 Fri 14:00>--<2011-09-30 Fri 18:00>
>> this shows up in the agenda view as:
>>   uni:        14:00...... timerange
>> while I would expect something like:
>>   uni:        14:00-18:00 timerange
> |the manual says:
> |Time ranges can be specified with two timestamps,
> |like ‘<2005-05-10 Tue 20:30>--<2005-05-10 Tue 22:15>’.
> |
> | 20:30-22:15 Marvin escorts the Hitchhikers to the bridge
> I confirm this bug.
> Org-mode version 7.7 0e9d401519c020af29a7e35da7acfca25e6c3be4
> GNU Emacs 23.3.1 (i386-mingw-nt5.1.2600) of 2011-03-10 on 3249CTO
> Giovanni

Funny enough, I noticed this too last week, so I whipped up this patch.
It inserts the range when start date is the same as the end date. Please
test (it's still young) && include in Org if you so please.

#+begin_src diff
>From dcf81753aa5cab311f2a3a0272e4691e4bc6ea38 Mon Sep 17 00:00:00 2001
From: Niels Giesen <>
Date: Mon, 26 Sep 2011 11:43:55 +0200
Subject: [PATCH] Show timestamp ranges in agenda

* lisp/org-agenda.el (org-agenda-get-blocks): Show timestamp ranges in
  agenda if start day is same as end day

6 years agoMake org-refile interface for jumping to a target work before first heading
Carsten Dominik [Wed, 5 Oct 2011 14:18:18 +0000 (16:18 +0200)]
Make org-refile interface for jumping to a target work before first heading

* lisp/org.el (org-refile-get-location): Ignore errors when
collection heading to be excluded.

6 years agoRevert "Avoid XHTML strict problems by not enclosing special blocks in paragraph...
Carsten Dominik [Tue, 4 Oct 2011 21:31:43 +0000 (23:31 +0200)]
Revert "Avoid XHTML strict problems by not enclosing special blocks in paragraph tags"

This reverts commit 4e3cc81a2e70c2f74f8d62a327e1b2a608f003d9.

6 years agoAvoid XHTML strict problems by not enclosing special blocks in paragraph tags
Carsten Dominik [Tue, 4 Oct 2011 14:22:27 +0000 (16:22 +0200)]
Avoid XHTML strict problems by not enclosing special blocks in paragraph tags

* lisp/org-special-blocks.el (org-special-blocks-convert-html-special-cookies):
Avoid XHTML strict problems by not enclosing special blocks in
paragraph tags.

6 years agoCheck argument is a string before calling string-match
Bernt Hansen [Tue, 20 Sep 2011 04:20:02 +0000 (04:20 +0000)]
Check argument is a string before calling string-match

* lisp/org-html.el (org-export-as-html): Check string-match argument
(org-html-handle-time-stamps): Check string-match argument

Avoid wrong-type-argument errors during exporting.

6 years agoChange default value of `org-agenda-skip-additional-timestamps-same-entry'
Carsten Dominik [Tue, 4 Oct 2011 12:30:32 +0000 (14:30 +0200)]
Change default value of `org-agenda-skip-additional-timestamps-same-entry'

* lisp/org-agenda.el (org-agenda-skip-additional-timestamps-same-entry):
Change default value.

6 years agoImprove error reporting on bad time stamps during agenda construction
Carsten Dominik [Tue, 4 Oct 2011 12:12:11 +0000 (14:12 +0200)]
Improve error reporting on bad time stamps during agenda construction

* lisp/org.el (org-time-string-to-time):
(org-time-string-to-absolute): Add optional arguments BUFFER and POS
for error reporting.
* lisp/org-agenda.el (org-get-all-dates):
(org-agenda-get-blocks): Call time stamp parsing functions with
information on where the timestamp was taken from.

6 years agoFix typo in previous commit
Carsten Dominik [Tue, 4 Oct 2011 08:00:10 +0000 (10:00 +0200)]
Fix typo in previous commit

6 years agoRun `org-cycle-hook' after `show-all' in indirect buffer
Carsten Dominik [Tue, 4 Oct 2011 07:56:12 +0000 (09:56 +0200)]
Run `org-cycle-hook' after `show-all' in indirect buffer

* lisp/org.el (org-tree-to-indirect-buffer): Run `org-cycle-hook' after `show-all'
in indirect buffer.

6 years agoBetter handling of ill-formed lists
Nicolas Goaziou [Thu, 22 Sep 2011 17:04:27 +0000 (19:04 +0200)]
Better handling of ill-formed lists

* lisp/org-list.el (org-list-parents-alist): When no parent is found
  for an item, set it as the closest less indented item above.  If
  none is found, make it a top level item.
(org-list-write-struct): Externalize code.
(org-list-struct-fix-item-end): New function.
(org-list-struct): Remove a now useless fix.
* lisp/org.el (org-ctrl-c-ctrl-c): Use new function.

6 years ago`org-special-ctrl-a/e' effectively behaves specially on items
Nicolas Goaziou [Sat, 1 Oct 2011 18:37:16 +0000 (20:37 +0200)]
`org-special-ctrl-a/e' effectively behaves specially on items

* lisp/org.el (org-end-of-line): When on an item, move point at the
  end of the line, but before any hidden text.  Thus, it's still
  possible to use commands, like C-c C-c, acting at items.  This is
  still disabled if `org-special-ctrl-a/e' ignores C-e.