6 years agoAdd custom face for highlighting tags used in agenda filtering.
Sebastien Vauban [Thu, 27 Oct 2011 21:08:04 +0000 (23:08 +0200)]
Add custom face for highlighting tags used in agenda filtering.

* org-agenda.el (org-agenda-set-mode-name): Highlight tags
used for filtering (shown in the mode-line).

* org-faces.el: Add face `org-agenda-filter-tags'.

6 years agoorg.texi: Add @cindex for "appointment".
Bastien Guerry [Sat, 29 Oct 2011 10:53:52 +0000 (12:53 +0200)]
org.texi: Add @cindex for "appointment".

* org.texi (Timestamps, Weekly/daily agenda)
(Weekly/daily agenda): Add @cindex for "appointment".

6 years agoorg-odt.el: Add support for annotation blocks
Jambunathan K [Fri, 28 Oct 2011 22:12:30 +0000 (03:42 +0530)]
org-odt.el: Add support for annotation blocks

* contrib/lisp/org-lparse.el (org-lparse-special-blocks): New
variable.  Add "annotation" blocks in addition to the already
existing "list-table" blocks.
(org-lparse-get-block-params): New helper routine to read
params passed to a special block.  Used in conjunction with
OpenDocument annotations and with parsing of "#+ATTR_ODT:..."
lines attached to images.
(org-lparse-par-open-stashed): New let-bound variable.
(org-do-lparse): Bind `org-lparse-par-open-stashed'.  Treat
all blocks listed in `org-lparse-special-blocks' as special
environments.  Honor options passed as part of
(org-lparse-preprocess-after-blockquote-hook): Handle all
blocks listed in `org-lparse-special-blocks' specially.
(org-lparse-strip-experimental-blocks-maybe-hook): New hook
that hooks up to `org-export-preprocess-hook'.  Removes blocks
listed under `org-lparse-special-blocks' while exporting to
formats other than "odt" or "xhtml".
(org-lparse-begin-environment, org-lparse-end-environment):
Modified signature to accomodate block params.
(org-lparse-stash-pop-paragraph-state): New helper routines
for use with emitting of OpenDocument annotations.
(org-lparse-list-table-enable): Removed.  "list tables" are
now always enabled.

* contrib/lisp/org-odt.el (org-odt-begin-annotation)
(org-odt-end-annotation): New routines.
(org-odt-begin-environment, org-odt-end-environment): Handle
block params.  Handle the new "annotation" block.
(org-odt-format-author, org-odt-iso-date-from-org-timestamp):
New helper routnes for emitting author and comment timestamps
with annotation blocks.
(org-odt-update-meta-file): Use above routines.
(org-export-odt-format-image): Use
`org-lparse-get-block-params' to parse inline image attributes.
(org-odt-format-date): Removed.  Superceded by


6 years agobetter handling of multiple-variable :var code block header arguments
Eric Schulte [Fri, 28 Oct 2011 19:57:47 +0000 (13:57 -0600)]
better handling of multiple-variable :var code block header arguments

* lisp/ob.el (org-babel-parse-multiple-vars): Trimming excess
  white space from split variables.

6 years agoAdd a way to search for a link search without impacting buffer visibility
Nicolas Goaziou [Wed, 26 Oct 2011 17:53:06 +0000 (19:53 +0200)]
Add a way to search for a link search without impacting buffer visibility

* lisp/org.el (org-link-search): Add an optional argument preventing
  function from revealing context around match.

6 years agoFix compiler warnings.
Bastien Guerry [Fri, 28 Oct 2011 15:26:22 +0000 (17:26 +0200)]
Fix compiler warnings.

6 years ago* org-agenda.el (calendar-check-holidays): Declare function.
Bastien Guerry [Fri, 28 Oct 2011 14:53:36 +0000 (16:53 +0200)]
* org-agenda.el (calendar-check-holidays): Declare function.

Thanks to Achim Gratz for spotting this.

6 years agoorg.el: Fix bug when matching the face property before following a link.
Bastien Guerry [Fri, 28 Oct 2011 14:42:20 +0000 (16:42 +0200)]
org.el: Fix bug when matching the face property before following a link.

* org.el (org-return): Fix bug when matching the face property
before following a link.

Thanks to Paul Sexton for the analysis and the fix.

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

6 years agoFix holidays symbol in org-class
Matt Lundin [Fri, 28 Oct 2011 17:57:42 +0000 (17:57 +0000)]
Fix holidays symbol in org-class

* lisp/org-agenda.el: (org-class): Fix holidays symbol in org-class.
  This was resulting in an "Bad sexp..." warning.

6 years agoSave complex heading regexp for column view
Carsten Dominik [Fri, 28 Oct 2011 12:47:32 +0000 (14:47 +0200)]
Save complex heading regexp for column view

* lisp/org.el (org-scan-tags): Also remember `org-complex-heading-regexp'
in a property.

6 years agoMerge branch 'master' of
Bastien Guerry [Fri, 28 Oct 2011 09:18:21 +0000 (11:18 +0200)]
Merge branch 'master' of

6 years agoTurn off auto insert and TeX master query for export
Carsten Dominik [Fri, 28 Oct 2011 08:03:33 +0000 (10:03 +0200)]
Turn off auto insert and TeX master query for export

* lisp/org-latex.el (org-export-as-latex): Turn off auto-insert and
set TeX-master to t when creating new TeX buffers.
* lisp/org-docbook.el (org-export-as-docbook):
* lisp/org-html.el (org-export-as-html): Turn off auto-insert
when creating new buffers.

6 years agoMerge branch 'master' of
Bastien Guerry [Thu, 27 Oct 2011 16:23:08 +0000 (18:23 +0200)]
Merge branch 'master' of

6 years agoMerge branch 'master' of
Carsten Dominik [Thu, 27 Oct 2011 16:13:33 +0000 (18:13 +0200)]
Merge branch 'master' of

6 years agoFix remote references that contain pointers to first/last rows/columns
Carsten Dominik [Thu, 27 Oct 2011 15:30:47 +0000 (17:30 +0200)]
Fix remote references that contain pointers to first/last rows/columns

* lisp/org-table.el (org-table-formula-handle-first/last-rc): Do not
expand pointers to first/last row/column that are inside a call
to `remote'.
(org-table-get-remote-range): Expand pointers to first/last

Wu Feng writes:

> Hello,
> First, please check below simple example, I defined two tables (T1 and
> T2). In table-2, I remotely refer to the @>$1 (last row, column 1) and
> $LR2 (last row, column 2) of T1.
> | 11 | 12 |
> | 21 | 22 |
> | 31 | 32 |
> | xxx | xxx | xxx | xxx |
> | #   |  21 |  32 |     |
> #+TBLFM: @>$3=remote(T1,$LR2)::@>$2=remote(T1,@>$1)
> Obviously, the expected results are:
> - remote(T1,@>$1) is replaced by 31
> - remote(T1,$LR2) is replaced by 32
> But I got 21 for remote(T1,@>$1). The $LR version works perfectly
> (though the manual says $LR is out-dated)
> Below are debug info when evaluating remote(T1,@>$1). Looks like @> in
> the remote reference is mapped to the last row of the current table, not
> of the remote table.
> Substitution history of formula
> Orig:   remote(T1,@2$1)
> $xyz->  remote(T1,@2$1)
> @r$c->  (21)
> $1->    (21)
> Result: 21
> Format: NONE
> Final:  21
> Emacs  : GNU Emacs 23.3.1 (i686-pc-linux-gnu, GTK+ Version 2.24.6)
> of 2011-09-13 on shirley
> Package: Org-mode version 7.7

6 years agoMerge branch 'master' of
Bastien Guerry [Wed, 26 Oct 2011 21:04:19 +0000 (23:04 +0200)]
Merge branch 'master' of

6 years agoadding ob-picolisp by Thorsten Jolitz to contrib/babel/langs
Eric Schulte [Wed, 26 Oct 2011 19:02:11 +0000 (13:02 -0600)]
adding ob-picolisp by Thorsten Jolitz to contrib/babel/langs

6 years agoorg-capture and XEmacs, indenting too far
Michael Sperber [Sat, 22 Oct 2011 19:46:07 +0000 (19:46 +0000)]
org-capture and XEmacs, indenting too far

Robert Pluim <> writes:

> Hi, I'm using XEmacs 21.5  (beta29) "garbanzo" d27c1ee1943b+ [Lucid]
> (i686-pc-cygwin, Mule) of Mon Oct 18 2010 on RPluim, with the following
> org-capture-templates
> (("t" "Todo" entry (file+headline "~/org/" "Tasks") "* TODO %?"))
> The problem is that for some reason the resulting TODO heading is has 2
> extra spaces, and is placed at too deep a level, giving:
> * Tasks
> ***   TODO a task
> I've tested this on a fairly recent emacs24 build, and everything works
> fine there, so this is probably something XEmacs specific.  Can anyone
> suggest any way to track this down (I'd bisect, but I've yet to find a
> 'good' version)?

I finally got around to looking into this: The reason is that, in
org-capture mode, `outline-level' is bound to outline.el's function,
which is off by one compared to org-mode's.  I used this patch to fix

Could somebody review and maybe apply this?

6 years ago* org-capture.el (org-capture-get-indirect-buffer): Fix XEmacs
Michael Sperber [Wed, 26 Oct 2011 17:43:07 +0000 (19:43 +0200)]
* org-capture.el (org-capture-get-indirect-buffer): Fix XEmacs
compatibility issue when creating an indirect buffer.


6 years agosupport LATEX_CLASS_OPTIONS in #+SETUPFILE
Christophe Rhodes [Wed, 26 Oct 2011 15:13:20 +0000 (16:13 +0100)]

* lisp/org-exp.el (org-infile-export-plist): Handle LATEX_CLASS_OPTIONS
  the same way than LATEX_CLASS.

6 years agoBugfix: make `org-return' detect 'org-link face properly.
Bastien Guerry [Wed, 26 Oct 2011 17:20:12 +0000 (19:20 +0200)]
Bugfix: make `org-return' detect 'org-link face properly.

* org.el (org-return): Check the presence of the 'org-link
face even in contexts where there is more than one face.

Thanks to Maximilian Matthé for reporting this bug.

6 years agoAddition of default-description parameter to org-insert-link
Yuri Lenskiy [Wed, 26 Oct 2011 21:47:46 +0000 (21:47 +0000)]
Addition of default-description parameter to org-insert-link

This patch, against the stable 7.7 branch version of org.el, adds a
default-description argument to org-insert-link that, if non-nil, will
become the default description.

- Yuri Lenskiy

6 years agoadding list of SQL specific header argument names which should be inherited
Eric Schulte [Wed, 26 Oct 2011 12:19:54 +0000 (06:19 -0600)]
adding list of SQL specific header argument names which should be inherited

* lisp/ob-sql.el (org-babel-header-arg-names:sql): SQL specific header
  argument names which should be inherited.

6 years agoHave a more informative return value for `org-in-block-p'
Nicolas Goaziou [Wed, 26 Oct 2011 08:45:28 +0000 (10:45 +0200)]
Have a more informative return value for `org-in-block-p'

* lisp/org.el (org-in-block-p): Return matched name of block, if any.
  It can be useful when a list of block names is provided as an argument.

6 years agoFix a regexp in HTML and DocBook exporters
Nicolas Goaziou [Tue, 25 Oct 2011 14:39:31 +0000 (16:39 +0200)]
Fix a regexp in HTML and DocBook exporters

* lisp/org-docbook.el (org-export-as-docbook): Fix regexp.
* lisp/org-html.el (org-export-as-html): Fix regexp.

The erroneous regexp would identify the string " *" as an headline.

6 years agoMake `diary-class' skip hlidays if the user asks for it.
Carsten Dominik [Tue, 25 Oct 2011 14:07:01 +0000 (16:07 +0200)]
Make `diary-class' skip hlidays if the user asks for it.

* lisp/org-agenda.el (org-class): Allow holidays to be skipped.

6 years agoMark `org-diary-class obsolete'
Carsten Dominik [Tue, 25 Oct 2011 14:00:06 +0000 (16:00 +0200)]
Mark `org-diary-class obsolete'

6 years agoob-shen: fix two compilation errors
Eric Schulte [Tue, 25 Oct 2011 02:00:02 +0000 (20:00 -0600)]
ob-shen: fix two compilation errors

* lisp/ob-shen.el (org-babel-execute:shen): Fix two compilation

6 years agoadding two new links to the template for inserting empty code blocks
Eric Schulte [Tue, 25 Oct 2011 01:42:48 +0000 (19:42 -0600)]
adding two new links to the template for inserting empty code blocks

* doc/org.texi (Literal examples): A new link to the template for
  inserting empty code blocks.
  (Structure of code blocks): A new link to the template for inserting
  empty code blocks.

6 years agoMinor docstring fix.
Bastien Guerry [Mon, 24 Oct 2011 21:47:59 +0000 (23:47 +0200)]
Minor docstring fix.

Thanks to Peter Münster for spotting this.

6 years agoAgenda: Allow filter list without category in org-agenda-to-appt
Peter Münster [Mon, 24 Oct 2011 18:52:45 +0000 (20:52 +0200)]
Agenda: Allow filter list without category in org-agenda-to-appt

* lisp/org-agenda.el (org-agenda-to-appt): Make sure filter-items are
strings before calling `string-match'.

Now it's possible to use (org-agenda-to-appt t '((headline "string"))).


6 years agoMove cmds and user vars in lparse namespace to odt namespace
Jambunathan K [Mon, 24 Oct 2011 18:53:42 +0000 (00:23 +0530)]
Move cmds and user vars in lparse namespace to odt namespace

* contrib/lisp/org-odt.el
(org-export-odt-preferred-output-format): Use
`org-lparse-reachable-format'.  Update docstring.
(org-export-odt-convert-capabilities): New customizable
variables.  Migrated from org-lparse.el.
(org-export-odt-convert): New.  Replaces `org-lparse-convert'.
(org-odt-get): Handle options - `CONVERT-METHOD' and

* contrib/lisp/org-lparse.el (org-lparse-and-open)
(org-replace-region-by, org-lparse-region, org-lparse): Made
these functions non-interactive.
(org-lparse-convert): Removed.  Splitted it in to
`org-lparse-convert-read-params' and `org-lparse-do-convert'.
(org-lparse-convert-read-params, org-lparse-do-convert): New
helper routines.
(org-lparse-convert-processes, org-lparse-convert-process)
(org-lparse-convert-capabilities): Removed.  Migrated to
(org-lparse-get-other-backends, org-lparse-get-converter)
(org-lparse-all-backends): Removed these helper routines.
(org-lparse-reachable-formats, org-lparse-reachable-p): New
helper routines.
(org-do-lparse): Misc changes.

org-lparse.el is likely to be replaced by Nicolas Goazious's
backend.  So, with future-proofing in view, hide org-lparse.el
from direct user contact.  This amounts to retiring all
interactive functions and customizable variables that have
org-lparse as prefix and migrating their existing functinality
to the odt namespace.  This set of changes does precisely

6 years agoFix header prefixes for trac wiki.
Robert P. Goldman [Fri, 21 Oct 2011 16:13:29 +0000 (11:13 -0500)]
Fix header prefixes for trac wiki.

trac wiki has hard limit on number of headers.  Need space before
macro characters in trac wiki.

Add a couple of TODO comments.

6 years agoFixed section-header-prefix for trac wiki.
Robert P. Goldman [Fri, 21 Oct 2011 16:13:28 +0000 (11:13 -0500)]
Fixed section-header-prefix for trac wiki.

6 years agoKill the HTML exporter.
Robert P. Goldman [Fri, 21 Oct 2011 16:13:27 +0000 (11:13 -0500)]
Kill the HTML exporter.

This is done better in core org-mode.

6 years agoorg-footnote: Remove text-properties from label
Nicolas Goaziou [Mon, 24 Oct 2011 06:10:56 +0000 (08:10 +0200)]
org-footnote: Remove text-properties from label

* lisp/org-footnote.el (org-footnote-at-reference-p,
org-footnote-at-definition-p): Remove text-properties from label.

6 years ago* org-html.el (org-export-as-html): Add a "title" meta tag.
Bastien Guerry [Sun, 23 Oct 2011 21:39:23 +0000 (23:39 +0200)]
* org-html.el (org-export-as-html): Add a "title" meta tag.

6 years agoorg-agenda.el (org-agenda-to-appt): Better filtering.
Bastien Guerry [Sun, 23 Oct 2011 21:21:34 +0000 (23:21 +0200)]
org-agenda.el (org-agenda-to-appt): Better filtering.

* org-agenda.el (org-agenda-to-appt): Allow to refine the
scope of entries to pass to `org-agenda-get-day-entries' and
allow to filter out entries using a function.

Thanks to Peter Münster for raising a related issue and to
Tassilo Horn for this idea.

6 years agoMerge branch 'master' of
Bastien Guerry [Sun, 23 Oct 2011 21:03:03 +0000 (23:03 +0200)]
Merge branch 'master' of

6 years agoSilence byte-compiler.
Bastien Guerry [Sun, 23 Oct 2011 20:45:53 +0000 (22:45 +0200)]
Silence byte-compiler.

6 years agoorg-agenda: Fix small display bug.
Nicolas Goaziou [Sun, 23 Oct 2011 20:42:48 +0000 (22:42 +0200)]
org-agenda: Fix small display bug.

* lisp/org-agenda.el: Fix small display bug.

6 years agoFix regexps for headlines
Nicolas Goaziou [Sun, 23 Oct 2011 16:14:21 +0000 (18:14 +0200)]
Fix regexps for headlines

* lisp/org.el (org-set-regexps-and-options): Fix small bug introduced
  by commit dfcb6faef11a2439b56b18a6289803361d402130.

6 years agoDefine customizable group org-export-odt
Jambunathan K [Sun, 23 Oct 2011 08:14:58 +0000 (13:44 +0530)]
Define customizable group org-export-odt

* contrib/lisp/org-odt.el (org-export-odt): Define the missing
customizable group and hook it up with `org-export'
customizable group.
(org-export-odt-preferred-output-format): Fix the `:group'

6 years agoorg-odt.el: Rename some variables that affect inline images
Jambunathan K [Sun, 23 Oct 2011 07:50:41 +0000 (13:20 +0530)]
org-odt.el: Rename some variables that affect inline images

* contrib/lisp/org-odt.el (org-export-odt-inline-images):
Renamed from `org-odt-export-inline-images'.  Also removed
(org-export-odt-inline-image-extensions): Renamed from
`org-odt-export-inline-image-extensions'.  Also fixed the
`:group' property.
(org-odt-format-org-link): Propagate above changes.

6 years agoMake org-export-odt-embed-images internal
Jambunathan K [Sun, 23 Oct 2011 07:21:24 +0000 (12:51 +0530)]
Make org-export-odt-embed-images internal

* contrib/lisp/org-odt.el (org-export-odt-embed-images):
Removed customizability of this variable.

6 years agoRename org-export-odt-use-htmlfontify to org-export-odt-fontify-srcblocks
Jambunathan K [Sun, 23 Oct 2011 07:10:13 +0000 (12:40 +0530)]
Rename org-export-odt-use-htmlfontify to org-export-odt-fontify-srcblocks

* contrib/lisp/org-odt.el (org-export-odt-use-htmlfontify):
Replaced with `org-export-odt-fontify-srcblocks'.
(org-export-odt-fontify-srcblocks): Renamed from
(org-odt-format-source-code-or-example): Rename above

6 years agoRemove org-export-odt-use-bookmarks-for-internal-link
Jambunathan K [Sun, 23 Oct 2011 06:59:49 +0000 (12:29 +0530)]
Remove org-export-odt-use-bookmarks-for-internal-link

* contrib/lisp/org-odt.el
(org-export-odt-use-bookmarks-for-internal-links): Removed
unused variable.

6 years agoProvide more consistent regexps for headlines
Nicolas Goaziou [Wed, 24 Aug 2011 23:58:29 +0000 (01:58 +0200)]
Provide more consistent regexps for headlines

* lisp/org-agenda.el (org-search-view): Simplify regexp.
(org-agenda-get-todos): Use new format string.
* lisp/org-archive.el (org-archive-all-done): Simplify regexp.
* lisp/org-ascii.el (org-export-as-ascii): More accurate regexp.
* lisp/org-colview-xemacs.el (org-columns-capture-view): Use new
  format string and new string.
* lisp/org-colview.el (org-columns-capture-view): Use new format
  string and new string.
* lisp/org-docbook.el (org-export-as-docbook): More accurate
  regexp.  Also use new regexp to match generic headlines.
* lisp/org-exp.el (org-export-protect-quoted-subtrees): More accurate
  regexp.  Also use new regexp to match generic headlines.
* lisp/org-html.el (org-export-as-html): More accurate regexp.  Also
  use new regexp to match generic headlines.
* lisp/org-mouse.el (org-mouse-match-todo-keyword): Removed unused
  and now erroneous function.
* lisp/org.el (org-heading-regexp, org-heading-keyword-regexp-format):
  New variables.
(org-set-regexps-and-options): Create regexps according to the
following rule: use spaces only to separate elements from an headline,
while allowing mixed tabs and spaces for any indentation job.
(org-nl-done-regexp, org-looking-at-done-regexp): Removed variables.
(org-set-font-lock-defaults): Fontify again headlines with a keyword
and no other text.  Use new format strings.
(org-get-heading, org-toggle-comment, org-prepare-agenda-buffers,
org-toggle-fixed-width-section): Use new format string.
(org-todo): More accurate regexps.
(org-point-at-end-of-empty-headline): Simplify regexp.
(org-insert-heading): Headline can sometimes be nil.

This patch attempts to reduce the number of hard-coded headlines, by
providing two format strings and one generic string to cover most of
the cases of headline construction.

6 years agoAvoid conflict between bulk command and loop-over-headlines
David Maus [Thu, 25 Aug 2011 04:25:34 +0000 (06:25 +0200)]
Avoid conflict between bulk command and loop-over-headlines

* org-agenda.el (org-agenda-bulk-action): Bind
`org-loop-over-headlines-in-active-region' to nil to avoid conflict
with bulk command.

6 years agoSkip invisible headlines when mapping over headlines in active region
David Maus [Thu, 25 Aug 2011 04:25:33 +0000 (06:25 +0200)]
Skip invisible headlines when mapping over headlines in active region

* org.el (org-deadline, org-schedule): Skip invisible headlines when
mapping over headlines in active region.

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