3 years agoProtect open buffers when publishing sitemap release_8.2.7c
Matt Lundin [Tue, 29 Jul 2014 18:35:41 +0000 (13:35 -0500)]
Protect open buffers when publishing sitemap

* lisp/ox-publish.el: (org-publish-find-title) (org-publish-find-date)
  Make sure to call org-export-get-environment in copy of buffer if
  emacs is already visiting. Otherwise, #+bind variables meant for
  export can be set in live buffers.

This patch also optimizes the above functions by inhibiting
org-startup on buffers emacs visits temporarily.

3 years agoFix docstring of org-agenda-inhibit-startup
Matt Lundin [Tue, 29 Jul 2014 15:59:19 +0000 (10:59 -0500)]
Fix docstring of org-agenda-inhibit-startup

* lisp/org.el: org-agenda-inhibit-startup: fix docstring to reflect
  default value

3 years agomk/ consider only release_* tags for constructing version strings
Achim Gratz [Wed, 2 Jul 2014 18:32:24 +0000 (20:32 +0200)]
mk/ consider only release_* tags for constructing version strings

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

3 years agoRemove unnecessary invocations of org-mode
Matt Lundin [Tue, 29 Jul 2014 04:56:42 +0000 (23:56 -0500)]
Remove unnecessary invocations of org-mode

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

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

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

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

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

Thanks to Thomas Morgan for reporting this.

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

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

Thanks to Raimund Berger for reporting this.

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

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

3 years agoox-latex: Fix defcustoms
Nicolas Goaziou [Mon, 28 Jul 2014 13:25:50 +0000 (15:25 +0200)]
ox-latex: Fix defcustoms

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

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

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

Thanks to Anders Johansson for reporting this.

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

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

Thanks to Marco Wahl for the suggested fix.

3 years agoox: Implement predicate for export blocks
Nicolas Goaziou [Sat, 26 Jul 2014 15:18:10 +0000 (17:18 +0200)]
ox: Implement predicate for export blocks

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

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

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

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

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

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

3 years agoorg-element: Fix object parsing in captions
Nicolas Goaziou [Fri, 25 Jul 2014 12:47:38 +0000 (14:47 +0200)]
org-element: Fix object parsing in captions

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

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

Thanks to Thomas S. Dye for reporting it.

3 years agoox-odt: Silence byte-compiler
Nicolas Goaziou [Fri, 25 Jul 2014 09:20:49 +0000 (11:20 +0200)]
ox-odt: Silence byte-compiler

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

3 years agoorg-clock: Update syntax for indentation in clock tables
Nicolas Goaziou [Fri, 25 Jul 2014 09:02:55 +0000 (11:02 +0200)]
org-clock: Update syntax for indentation in clock tables

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

Thanks to Buddy Butterfly for reporting it.

3 years agoox-odt: Fix handling of quoted and centered paragraphs
Nicolas Goaziou [Thu, 24 Jul 2014 12:48:47 +0000 (14:48 +0200)]
ox-odt: Fix handling of quoted and centered paragraphs

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

Thanks to Baptiste for reporting it.

3 years agoWhen editing a table formula, point is not necessarily on its referent.
Nick Dokos [Tue, 22 Jul 2014 21:11:36 +0000 (17:11 -0400)]
When editing a table formula, point is not necessarily on its referent.

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

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

Robert Klein bisected it down to 30220ffcdcef45c0237f80a2347d4da19877f64a.

3 years agoorg-element: Fix test failure
Nicolas Goaziou [Wed, 23 Jul 2014 08:07:55 +0000 (10:07 +0200)]
org-element: Fix test failure

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

3 years agoorg-element: Fix regexp matching LaTeX environments
Nicolas Goaziou [Tue, 22 Jul 2014 09:52:32 +0000 (11:52 +0200)]
org-element: Fix regexp matching LaTeX environments

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

3 years agoorg-clean-before-export matches non-special columns spuriously
Nick Dokos [Fri, 18 Jul 2014 13:09:38 +0000 (09:09 -0400)]
org-clean-before-export matches non-special columns spuriously

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

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

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

The bug was found by Thorsten Grothe:

3 years agoox-ascii: Fix tables with a width cookie
Nicolas Goaziou [Thu, 26 Jun 2014 10:17:28 +0000 (12:17 +0200)]
ox-ascii: Fix tables with a width cookie

* lisp/ox-ascii.el (org-ascii--table-cell-width): Correctly export
  tables with width cookies.

3 years agoFix typos: backport revision r117377 from emacs trunk release_8.2.7b
Bastien Guerry [Mon, 23 Jun 2014 07:40:19 +0000 (09:40 +0200)]
Fix typos: backport revision r117377 from emacs trunk

3 years agoorg.el: Delete `org-fix-ellipsis-at-bol'
Bastien Guerry [Fri, 20 Jun 2014 06:41:34 +0000 (08:41 +0200)]
org.el: Delete `org-fix-ellipsis-at-bol'

* org.el (org-fix-ellipsis-at-bol): Delete.
(org-mode, org-show-context, org-isearch-end): Don't use

3 years agoox-koma-letter.el (koma-letter): Use `org-koma-letter-from-address' release_8.2.7a
IOhannes m zmoelnig [Wed, 18 Jun 2014 22:47:42 +0000 (00:47 +0200)]
ox-koma-letter.el (koma-letter): Use `org-koma-letter-from-address'

* ox-koma-letter.el (koma-letter): Use


3 years agoorg-agenda.el (org-agenda-filter-apply): Fix setting of `org-agenda-filtered-by-category'
Bastien Guerry [Mon, 16 Jun 2014 09:41:14 +0000 (11:41 +0200)]
org-agenda.el (org-agenda-filter-apply): Fix setting of `org-agenda-filtered-by-category'

* org-agenda.el (org-agenda-filter-apply): Fix setting of

3 years agoorg.el (org-fontify-meta-lines-and-blocks-1): Fix handling of `org-hidden-keywords'
Bastien Guerry [Sun, 15 Jun 2014 08:49:01 +0000 (10:49 +0200)]
org.el (org-fontify-meta-lines-and-blocks-1): Fix handling of `org-hidden-keywords'

* org.el (org-fontify-meta-lines-and-blocks-1): Fix handling
of `org-hidden-keywords'.

Thanks to Leu Zhe for reporting this.

3 years agoorg-agenda.el (org-cmp-ts): Fix agenda entry type checking
Bastien Guerry [Sun, 15 Jun 2014 08:43:17 +0000 (10:43 +0200)]
org-agenda.el (org-cmp-ts): Fix agenda entry type checking

* org-agenda.el (org-cmp-ts): Fix agenda entry type checking.

Thanks to Trevor Murphy for reporting this.

3 years agoorg-agenda.el (org-entries-lessp): Fix inactive timestamp comparison
Bastien Guerry [Sun, 15 Jun 2014 08:36:59 +0000 (10:36 +0200)]
org-agenda.el (org-entries-lessp): Fix inactive timestamp comparison

* org-agenda.el (org-entries-lessp): Fix inactive timestamp

3 years agoorg-macs: Remove restriction when locating markers
Bernt Hansen [Sun, 15 Jun 2014 02:50:07 +0000 (22:50 -0400)]
org-macs: Remove restriction when locating markers

* org-macs.el: Remove restriction when locating markers

Allows org-with-point-at to locate point outside the current

3 years agofix semi-backend bug in org-mime release_8.2.7
Eric Schulte [Thu, 12 Jun 2014 18:40:32 +0000 (14:40 -0400)]
fix semi-backend bug in org-mime

* contrib/lisp/org-mime.el (org-mime-multipart): Fix bug in use of the
  semi org-mime-library when converting emails to HTML.

3 years agoFix 30220ff
Bastien Guerry [Thu, 12 Jun 2014 13:25:42 +0000 (15:25 +0200)]
Fix 30220ff

3 years agoorg-agenda.el: Fix bug when redoing sticky agendas with log mode and/or clockreport...
Bastien Guerry [Thu, 12 Jun 2014 13:07:35 +0000 (15:07 +0200)]
org-agenda.el: Fix bug when redoing sticky agendas with log mode and/or clockreport mode on

* org-agenda.el (org-agenda-mode): Let `org-agenda-redo' DTRT
when agenda are sticky.
(org-agenda-tag-filter-while-redo): Delete.
(org-agenda-list, org-agenda-redo, org-agenda-filter-by-tag):
Remove unused code.
(org-agenda-clockreport-mode, org-agenda-set-mode-name): Don't
consider tag filters.

Thanks to Bernt Hansen for reporting this.

3 years agoPrefer `set-window-start' over `recenter' in some places.
Bastien Guerry [Thu, 12 Jun 2014 10:04:24 +0000 (12:04 +0200)]
Prefer `set-window-start' over `recenter' in some places.

* org-agenda.el (org-agenda-show-1):
* org-table.el (org-table-show-reference):
* org.el (org-fix-ellipsis-at-bol)
(org-first-headline-recenter): Use `set-window-start' instead
of `recenter'.

* org-agenda.el (org-recenter-heading): Delete.

3 years agoorg.el (org-insert-heading): Be more consistent in respecting content
Bastien Guerry [Wed, 11 Jun 2014 15:45:13 +0000 (17:45 +0200)]
org.el (org-insert-heading): Be more consistent in respecting content

* org.el (org-insert-heading): With one universal prefix
argument or `org-insert-heading-respect-content' set to `t',
always respect the content, i.e. don't insert a list item and
don't convert normal lines into headings.  Update docstring.
(org-insert-heading-respect-content): Remove unused arg.
(org-insert-todo-heading-respect-content): Don't use
`org-insert-todo-heading-respect-content', use the second
argument of `org-insert-todo-heading' instead.

* org-mobile.el (org-mobile-edit): Use only one arg.

Thanks to Bernt Hansen for reporting this.

3 years agoorg.el (org-overview): Don't call `recenter'
Bastien Guerry [Thu, 15 May 2014 09:11:43 +0000 (11:11 +0200)]
org.el (org-overview): Don't call `recenter'

* org.el (org-overview): Don't call `recenter'.

Thanks to Nicolas Richard for suggesting this.

3 years agoFix `org-insert-heading' before first headline
Nicolas Goaziou [Mon, 9 Jun 2014 16:07:07 +0000 (18:07 +0200)]
Fix `org-insert-heading' before first headline

* lisp/org.el (org-insert-heading): Fix error when inserting
  a headline before first headline, with point not at bol.  Remove
  source block check for consistency with behavior after first
  headline.  Tiny fix to docstring.

* testing/lisp/test-org.el (test-org/meta-return): Remove unnecessary
  test (not testing specifications).
(test-org/insert-heading): New test.

3 years agoFix typo
Nicolas Goaziou [Tue, 3 Jun 2014 21:28:08 +0000 (23:28 +0200)]
Fix typo

* lisp/org.el (org-scan-tags): Fix typo in docstring.

3 years agoox: Fix priority bug in :title property
Nicolas Goaziou [Tue, 3 Jun 2014 20:07:35 +0000 (22:07 +0200)]
ox: Fix priority bug in :title property

* lisp/ox.el (org-export--get-inbuffer-options): Return the empty
  string instead of nil when TITLE keywords has no value.
(org-export--get-buffer-attributes): Do not set :title property
(org-export--get-global-options): Do not ignore anymore nil values.
Small refactoring.
(org-export-as): Correctly set :title here.

Thanks to Nicolas Richard for reporting it.

3 years agomk/ add testing/ directory to distribution tarball
Achim Gratz [Mon, 2 Jun 2014 17:33:27 +0000 (19:33 +0200)]
mk/ add testing/ directory to distribution tarball

* mk/ (ORGFULL): Add testing/ directory to distribution

3 years agoMakefile: remove empty line in help output
Achim Gratz [Mon, 2 Jun 2014 17:32:26 +0000 (19:32 +0200)]
Makefile: remove empty line in help output

* Makefile (help helpall): Remove empty line in help output.

3 years agoorg-agenda.el (org-agenda-custom-commands-local-options): Fix misquoted values
Bastien Guerry [Mon, 2 Jun 2014 17:59:36 +0000 (19:59 +0200)]
org-agenda.el (org-agenda-custom-commands-local-options): Fix misquoted values

* org-agenda.el (org-agenda-custom-commands-local-options):
Fix misquoted values.

Thanks to Thomas Morgan for reporting this.

3 years agoorg.el: Fix setting and deleting properties with a null value
Bastien Guerry [Mon, 2 Jun 2014 13:40:04 +0000 (15:40 +0200)]
org.el: Fix setting and deleting properties with a null value

* org.el (org-property-re): Also match null properties by
(org-entry-delete): Also delete null properties.
(org-read-property-value): Allow the empty string as a new
(org-delete-property): Throw a message when there is not
property to delete.

Thanks to Andrea Rossetti for reporting this.

3 years agoorg.texi: Add f-1 to TBLFM example about nan
Michael Brand [Sun, 1 Jun 2014 13:27:07 +0000 (15:27 +0200)]
org.texi: Add f-1 to TBLFM example about nan

* doc/org.texi (Formula syntax for Calc): Add `f-1' to TBLFM example
about `nan'.

3 years agoReverting "org-footnote: forward declare functions"
Achim Gratz [Sun, 1 Jun 2014 12:28:13 +0000 (14:28 +0200)]
Reverting "org-footnote: forward declare functions"
Revert "org-footnote: forward declare functions"

This reverts commit 814188ac7e25c500433c13d8696af47d62f0de23.

Accidentally applied to the wrong branch.

3 years agoorg-footnote: forward declare functions
Achim Gratz [Sun, 1 Jun 2014 12:19:25 +0000 (14:19 +0200)]
org-footnote: forward declare functions

* lisp/org-footnote.el: Forward declare `org-element-context',
  `org-element-property' and `org-element-type'.

Introduced with 51e1131ff8.

3 years agoorg-list: Fix typo in docstring
Nicolas Goaziou [Sun, 1 Jun 2014 12:20:12 +0000 (14:20 +0200)]
org-list: Fix typo in docstring

* lisp/org-list.el (org-list-repair): Fix typo in docstring.

3 years agoDocumentation fix
Nicolas Goaziou [Sun, 1 Jun 2014 06:52:16 +0000 (08:52 +0200)]
Documentation fix

* doc/org.texi (Include files):
* doc/orgguide.texi (Include files): Remove reference to non-existent
  "quote" markup.

3 years agoorg-agenda.el (org-agenda-insert-diary-make-new-entry): Fix docstring
Bastien Guerry [Fri, 30 May 2014 11:58:50 +0000 (13:58 +0200)]
org-agenda.el (org-agenda-insert-diary-make-new-entry): Fix docstring

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

Thanks to Nikolai Weibull for reporting this.

3 years agoorg.el: Fix bug when setting properties with a null value
Bastien Guerry [Fri, 30 May 2014 06:46:39 +0000 (08:46 +0200)]
org.el: Fix bug when setting properties with a null value

* org.el (org-re-property): New parameter `allow-null' to
match property with a null value.
(org-entry-put): Correctly update a property with a null

Thanks to Andrea Rossetti for reporting this and suggesting a fix.

3 years agoox-md.el (org-md-headline): Add anchors when exporting with a table of contents
Bastien Guerry [Thu, 29 May 2014 19:20:55 +0000 (21:20 +0200)]
ox-md.el (org-md-headline): Add anchors when exporting with a table of contents

* ox-md.el (org-md-headline): When exporting with a HTML table
of contents, add HTML anchors to Markdown headlines.

Thanks to Marko Dimjašević for reporting this.

3 years agoorg.el (org-insert-heading): Don't insert an item when called with two universal...
Bastien Guerry [Thu, 29 May 2014 17:48:47 +0000 (19:48 +0200)]
org.el (org-insert-heading): Don't insert an item when called with two universal prefix arguments

* org.el (org-insert-heading): Don't insert an item when
called with two universal prefix arguments.

3 years agoorg-agenda.el (org-agenda-finalize): Remove duplicate check for 'org-hd-marker
Bastien Guerry [Thu, 29 May 2014 07:57:19 +0000 (09:57 +0200)]
org-agenda.el (org-agenda-finalize): Remove duplicate check for 'org-hd-marker

* org-agenda.el (org-agenda-finalize): Remove duplicate check
for 'org-hd-marker.

3 years agoorg.texi: Small documentation fix
Nicolas Goaziou [Wed, 28 May 2014 13:35:17 +0000 (15:35 +0200)]
org.texi: Small documentation fix

* doc/org.texi (Publishing options): Remove reference to inexistent
  variable.  The associated property is misplaced, too.

3 years agoorg: add forward declarations
Achim Gratz [Wed, 28 May 2014 13:17:29 +0000 (15:17 +0200)]
org: add forward declarations

* lisp/org.el: Add forward declarations for a number of functions that
  the compiler otherwise warns about as potentially undefined at

3 years agoob-core, ob-exp, ob-haskell, ob-python: declarations for org-src-preserve-indentations
Achim Gratz [Wed, 28 May 2014 12:52:14 +0000 (14:52 +0200)]
ob-core, ob-exp, ob-haskell, ob-python: declarations for org-src-preserve-indentations

* lisp/ob-core.el: Add comment to forward declaration of
* lisp/ob-exp.el: Require org-src to import
* lisp/ob-haskell.el, lisp/ob-python.el: Remove superfluous forward
  declaration of 'org-src-preserve-indentations', since it gets
  imported by other requires.

3 years agoob-core:forward declare org-every
Achim Gratz [Wed, 28 May 2014 12:47:23 +0000 (14:47 +0200)]
ob-core:forward declare org-every

* lisp/ob-core.el (org-every): Forward declare 'org-every'.

3 years agoob-C: lexical-let requires cl at compilation time
Achim Gratz [Wed, 28 May 2014 12:40:52 +0000 (14:40 +0200)]
ob-C: lexical-let requires cl at compilation time

* lisp/ob-C.el: Require cl during compilation so that lexical-let is

3 years agoorg-entities: forward declaration of org-toggle-pretty-entities and org-pretty-entities
Achim Gratz [Wed, 28 May 2014 12:16:21 +0000 (14:16 +0200)]
org-entities: forward declaration of org-toggle-pretty-entities and org-pretty-entities

* lisp/org-entities.el: Remove superfluous require of org-macs.
  Forward declare 'org-toggle-pretty-entities' and

3 years agoorg, ox: move defsubst before first use
Achim Gratz [Wed, 28 May 2014 11:18:05 +0000 (13:18 +0200)]
org, ox: move defsubst before first use

* lisp/ox.el (org-export-get-parent): Move definition of
  'org-export-get-parent' before first use.  Leave comment at original
  place of definition.

* lisp/org.el (org-uniquify): Move definition of 'org-uniquify' before
  first use.  Leave comment at original place of definition.

3 years agoorg-agenda.el: Fix bug wrt `org-agenda-persistent-filter'
Bastien Guerry [Mon, 26 May 2014 13:29:02 +0000 (15:29 +0200)]
org-agenda.el: Fix bug wrt `org-agenda-persistent-filter'

* org-agenda.el (org-agenda-prepare-window): New parameter
`filter-alist' to set the filters correctly when
`org-agenda-persistent-filter' is on.
(org-agenda-prepare): Use the new parameter for

Thanks to Thomas Morgan for reporting this.

3 years agoFix bug when update timestamps on filtered agenda entries
Bastien Guerry [Mon, 26 May 2014 12:55:50 +0000 (14:55 +0200)]
Fix bug when update timestamps on filtered agenda entries

* org-compat.el (org-in-invisibility-spec-p): Tiny code
(org-move-to-column): Only remove '(org-filtered) from

* org-agenda.el (org-agenda-mode): Add buffer invisibility
(org-agenda-filter-hide-line, org-agenda-remove-filter): Set
the 'invisible text property to 'org-filtered.
(org-agenda-show-new-time): Add the default face to avoid the
foreground of the last character on the line to leak into the
timestamp notification.

Thanks to Thomas Morgan for reporting this.

3 years agoorg-agenda.el (org-get-time-of-day): Don't return time string from within links
Bastien Guerry [Mon, 26 May 2014 05:35:24 +0000 (07:35 +0200)]
org-agenda.el (org-get-time-of-day): Don't return time string from within links

* org-agenda.el (org-get-time-of-day): Don't return time
string from within links.

Thanks to Thomas Morgan for reporting this.

3 years agoox-ascii: Tiny fix
Nicolas Goaziou [Sat, 24 May 2014 13:44:08 +0000 (15:44 +0200)]
ox-ascii: Tiny fix

* lisp/ox-ascii.el (org-ascii--current-text-width): Tiny fix.

3 years agoorg-timer.el (org-timer-value-string): Always return a positive value
Bastien Guerry [Sat, 24 May 2014 12:12:56 +0000 (14:12 +0200)]
org-timer.el (org-timer-value-string): Always return a positive value

* org-timer.el (org-timer-value-string): Always return a
positive value.  Add docstring.

3 years agoorg-capture.el (org-capture-fill-template): Set `mark-active' to nil
Alex Kosorukoff [Fri, 23 May 2014 19:50:24 +0000 (21:50 +0200)]
org-capture.el (org-capture-fill-template): Set `mark-active' to nil

* org-capture.el (org-capture-fill-template): Set
`mark-active' to nil.


3 years agoRevert "org-capture.el (org-capture-steal-local-variables): Don't steal `mark-active'"
Bastien Guerry [Fri, 23 May 2014 19:49:19 +0000 (21:49 +0200)]
Revert "org-capture.el (org-capture-steal-local-variables): Don't steal `mark-active'"

This reverts commit ee5a88cd01cccc7b12422aebe6269bfeb444d387.

3 years agoorg-capture.el (org-capture-steal-local-variables): Don't steal `mark-active'
Bastien Guerry [Fri, 23 May 2014 12:01:39 +0000 (14:01 +0200)]
org-capture.el (org-capture-steal-local-variables): Don't steal `mark-active'

* org-capture.el (org-capture-steal-local-variables): Don't
steal `mark-active', which should be nil in the target buffer.

Thanks to Alex Kosorukoff for raising this issue.

3 years agoorg-agenda.el (org-agenda-remove-filter): Use `save-excursion'
Bastien Guerry [Fri, 23 May 2014 11:43:11 +0000 (13:43 +0200)]
org-agenda.el (org-agenda-remove-filter): Use `save-excursion'

* org-agenda.el (org-agenda-remove-filter): Use `save-excursion'.

3 years agoorg.el: Don't advise `outline-end-of-subtree'
Bastien Guerry [Fri, 23 May 2014 11:11:57 +0000 (13:11 +0200)]
org.el: Don't advise `outline-end-of-subtree'

* org.el (org-move-subtree-down): Use `org-end-of-subtree'
instead of `outline-end-of-subtree'.
(outline-end-of-subtree): Remove advice.

* org-mouse.el (org-mouse-move-tree, org-mouse-do-remotely):
Use `org-end-of-subtree' instead of `outline-end-of-subtree'.

3 years agoorg.el (org-cycle-internal-local): Fix trailing character bug
Nicolas Richard [Fri, 23 May 2014 11:04:28 +0000 (13:04 +0200)]
org.el (org-cycle-internal-local): Fix trailing character bug

* org.el (org-cycle-internal-local): Don't show a trailing
character when cycling a subtree that ends with a non-newline
character at the end of the buffer or the narrowed region.

3 years agoorg-agenda.el (org-cmp-ts): Fix call to `type'
Bastien Guerry [Thu, 22 May 2014 19:15:01 +0000 (21:15 +0200)]
org-agenda.el (org-cmp-ts): Fix call to `type'

* org-agenda.el (org-cmp-ts): Argument `type' is not optional.
Don't quote it.

3 years agoorg-habit.el (org-habit-insert-consistency-graphs): Don't remove filter overlays
Bastien Guerry [Thu, 22 May 2014 12:34:46 +0000 (14:34 +0200)]
org-habit.el (org-habit-insert-consistency-graphs): Don't remove filter overlays

* org-habit.el (org-habit-insert-consistency-graphs): Don't
remove filter overlays as we don't use overlays for filters

3 years agoorg-agenda.el: Fixes for top headline filtering
Bastien Guerry [Thu, 22 May 2014 11:37:27 +0000 (13:37 +0200)]
org-agenda.el: Fixes for top headline filtering

* org-agenda.el (org-agenda-local-vars): Add
(org-agenda-filter-by-category): Fix syntax.
(org-agenda-filter-show-all-top-filter): New function.
(org-agenda-filter-remove-all): Use the new function.
(org-agenda-filter-top-headline-apply): Use a dedicated symbol

Thanks to Greg Troxel who provided a preliminary patch.

3 years agoorg-agenda.el (org-agenda-redo): Reapply the filters correctly
Konstantin Kliakhandler [Thu, 22 May 2014 10:55:30 +0000 (12:55 +0200)]
org-agenda.el (org-agenda-redo): Reapply the filters correctly

* org-agenda.el (org-agenda-redo): Reapply the filters


3 years agoorg.el (org-entry-properties): Ensure the special property is not commented out when...
Bastien Guerry [Thu, 22 May 2014 10:38:06 +0000 (12:38 +0200)]
org.el (org-entry-properties): Ensure the special property is not commented out when matched

* org.el (org-entry-properties): Ensure the special property
is not commented out when matched.

Other an agenda view like (tags "DEADLINE<\"<+0d>\"" ...) will
wrongly list an entry with a commented out DEADLINE line, because
org-agenda-skip only skip commented out stuff on the current line,
with is the headline itself when using "tags" agenda.

Thanks to Sébastien for reporting this.

3 years agoorg-agenda.el: Rewrite agenda filtering using text properties
Bastien Guerry [Wed, 21 May 2014 17:02:36 +0000 (19:02 +0200)]
org-agenda.el: Rewrite agenda filtering using text properties

* org-agenda.el (org-agenda-write): Code cleanup.
(org-agenda-fix-tags-filter-overlays-at): Delete.
(org-agenda-remove-marked-text): Use the `property' argument
instead of hard-coding 'org-filtered.
(org-agenda-filter-remove-all): Use `org-agenda-finalize'.
(org-agenda-filter-hide-line): Rewrite using text properties
instead of overlays.
(org-agenda-remove-filter): New function.
(org-agenda-filter-show-all-re): Rewrite using

3 years agoox-org: Tiny refactoring
Nicolas Goaziou [Wed, 21 May 2014 19:29:16 +0000 (21:29 +0200)]
ox-org: Tiny refactoring

* lisp/ox-org.el (org-org-section): Tiny refactoring.  Use appropriate

3 years agoorg-attach.el (org-attach-dir): Fix bug
Bastien Guerry [Wed, 21 May 2014 17:47:13 +0000 (19:47 +0200)]
org-attach.el (org-attach-dir): Fix bug

* org-attach.el (org-attach-dir): When the property is
"inherited" from a variable outside of the file, do not use
`org-entry-property-inherited-from' to find the attachment
position, assume we need to go back to the current headline.

3 years agoox-org: Fix missing footnote definitions
Nicolas Goaziou [Wed, 21 May 2014 16:33:53 +0000 (18:33 +0200)]
ox-org: Fix missing footnote definitions

* lisp/ox-org.el (org-org-headline): Ignore footnote sections.
(org-org-section): New function.

Some footnote definitions may be outside of the scope of the export
and, therefore, do not appear in the generated output.  This patch
ensures that all footnote definitions appear at the end of the section
they belong to.

Thanks to Leonard Randall for reporting it.

3 years agoFix error prone babel table output format detection
Ian Kelling [Thu, 1 May 2014 04:56:52 +0000 (21:56 -0700)]
Fix error prone babel table output format detection

* ob-core.el (org-babel-insert-result): Test all list elements against
listp and (eq element 'hline) instead of checking just the first.

org-babel table output uses different formatting for a list of lists,
but detects it incorrectly causing an error. An example of a block
causing an error is an emacs lisp source block containing just 1 line:
'((1) 2)

3 years agoob-R.el (org-babel-R-assign-elisp): Fix parsing of a one-dimensional value
Bastien Guerry [Wed, 21 May 2014 02:21:00 +0000 (04:21 +0200)]
ob-R.el (org-babel-R-assign-elisp): Fix parsing of a one-dimensional value

* ob-R.el (org-babel-R-assign-elisp): Fix parsing of a
one-dimensional value.

Thanks to Daniil Mirylenka for the fix.

3 years agoContinue fixing fdb4b54e
Bastien Guerry [Wed, 21 May 2014 01:56:26 +0000 (03:56 +0200)]
Continue fixing fdb4b54e

3 years agoorg.el (org-insert-heading): Fix bug
Bastien Guerry [Tue, 20 May 2014 21:28:06 +0000 (23:28 +0200)]
org.el (org-insert-heading): Fix bug

* org.el (org-insert-heading): Fix bug when trying to insert a
heading when point is before the first headline and not at the
beginning of a line.

3 years agoorg.el (org-fast-tag-selection): Fix window splitting
Dmitry Gorbik [Tue, 20 May 2014 20:20:56 +0000 (22:20 +0200)]
org.el (org-fast-tag-selection): Fix window splitting

* org.el (org-fast-tag-selection): Fix window splitting.

This is basically the same fix than the one listed here:


3 years agoorg-table.el (org-table-eval-formula): Fix conversion of inactive timestamps
Bastien Guerry [Tue, 20 May 2014 20:03:30 +0000 (22:03 +0200)]
org-table.el (org-table-eval-formula): Fix conversion of inactive timestamps

* org-table.el (org-table-eval-formula): Fix conversion of
inactive timestamps to active ones.

Thanks to Gang Chen for reporting this.

3 years ago* org.el (org-set-regexps-and-options): Fix
Bastien Guerry [Tue, 20 May 2014 16:00:05 +0000 (18:00 +0200)]
* org.el (org-set-regexps-and-options): Fix

* org.el (org-set-regexps-and-options): Allow
`org-complex-heading-regexp-format' to match [/] and [%]
cookies when they are both before and after the heading.

Thanks to Nicolas Bercher for reporting this.

3 years agoox-beamer: Fix environment selection wrt persistent tags
Nicolas Goaziou [Mon, 19 May 2014 11:37:16 +0000 (13:37 +0200)]
ox-beamer: Fix environment selection wrt persistent tags

* lisp/ox-beamer.el (org-beamer-select-environment): Ignore persistent
  tags when displaying environments.

Thanks to Anders Johansson for reporting it.

3 years agoox-ascii: Fix indentation in the first paragraph of a section
Nicolas Goaziou [Sat, 17 May 2014 08:00:41 +0000 (10:00 +0200)]
ox-ascii: Fix indentation in the first paragraph of a section

* lisp/ox-ascii.el (org-ascii-indented-line-width): Update docstring.
(org-ascii-paragraph): Do not apply indentation to the very first line
of a section.

3 years agoox-latex: Fix export of inlinetasks with empty contents
Nicolas Goaziou [Fri, 16 May 2014 08:33:20 +0000 (10:33 +0200)]
ox-latex: Fix export of inlinetasks with empty contents

* lisp/ox-latex.el (org-latex-inlinetask): Skip body if contents are

Thanks to Michael Weylandt for reporting it and providing
a preliminary patch.

3 years agoox-html: Fix spurious "figure" divs on empty paragraphs
Nicolas Goaziou [Thu, 15 May 2014 11:39:28 +0000 (13:39 +0200)]
ox-html: Fix spurious "figure" divs on empty paragraphs

* lisp/ox-html.el (org-html-standalone-image-p): Ensure paragraph
  contains at least a link before return a non-nil value.  Clarify

Thanks to Fabrice Popineau for reporting it.

3 years agoox: Fix Wrong type argument error with empty footnotes
Nicolas Goaziou [Mon, 12 May 2014 20:18:00 +0000 (22:18 +0200)]
ox: Fix Wrong type argument error with empty footnotes

* lisp/ox.el (org-export-data): Always return a string, as specified
  by the docstring.

Thanks to kuanyui for reporting it.

3 years agoUpdate org-mime to current export functions
Eric Abrahamsen [Thu, 8 May 2014 14:32:01 +0000 (22:32 +0800)]
Update org-mime to current export functions

* /contrib/lisp/org-mime.el (org-mime-send-buffer):

This function was using `org-export-grab-title-from-buffer', which no
longer exists.

3 years agoMake superscripts produce a ^ in the output, instead of _
Nick Dokos [Fri, 9 May 2014 03:47:14 +0000 (23:47 -0400)]
Make superscripts produce a ^ in the output, instead of _

* ox-ascii.el (org-ascii-superscript): Change _ to ^ in the output.

Reported by Suvayu Ali:

3 years agoob-screen, use unpredictable temp file name
Eric Schulte [Thu, 8 May 2014 18:16:45 +0000 (12:16 -0600)]
ob-screen, use unpredictable temp file name

* lisp/ob-screen.el (org-babel-screen-test): Use unpredictable name
  for temporary file.

3 years agodon't use predictable temp files in ob-screen
Eric Schulte [Wed, 7 May 2014 09:34:26 +0000 (05:34 -0400)]
don't use predictable temp files in ob-screen

* lisp/ob-screen.el (org-babel-screen-session-write-temp-file):
  Unpredictable temp file name, fixes bug 17416.

3 years agoob-tangle: do not run make-directory with nil argument
Achim Gratz [Sat, 3 May 2014 08:12:10 +0000 (10:12 +0200)]
ob-tangle: do not run make-directory with nil argument

* lisp/ob-tangle.el (org-babel-tangle): When `file-name-directory'
  returns nil, do not run make-directory.  Remove superfluous when
  clauses by using short-circuiting `and' instead.

Thanks to R. Michael Weylandt for reporting the problem and offering a

3 years agoorg-agenda.el: Fix some type strings
Bastien Guerry [Fri, 2 May 2014 13:30:46 +0000 (15:30 +0200)]
org-agenda.el: Fix some type strings

* org-agenda.el (org-agenda-max-todos, org-agenda-max-tags)
(org-agenda-max-effort): Fix type strings.

3 years agoFix commit fdb4b54e
Bastien Guerry [Wed, 30 Apr 2014 08:43:40 +0000 (10:43 +0200)]
Fix commit fdb4b54e

3 years agodoc/texinfo.tex: Update to stable version 5.2
Bastien Guerry [Tue, 29 Apr 2014 11:46:21 +0000 (13:46 +0200)]
doc/texinfo.tex: Update to stable version 5.2

3 years agoMerge branch 'maint' of into maint
Bastien Guerry [Tue, 29 Apr 2014 11:08:10 +0000 (13:08 +0200)]
Merge branch 'maint' of into maint