Commit Graph

12428 Commits

Author SHA1 Message Date
Bastien Guerry 576f43b743 Merge branch 'maint' 2013-01-04 17:23:27 +01:00
Henning Weiss f90bc18561 org-mobile.el: Remove match description from block agendas when they have a title
* org-mobile.el (org-mobile-sumo-agenda-command): Remove match
description from block agendas when they have a title.

This makes the generated agendas.org file more readable, as
complicated block agendas otherwise have long titles.

TINYCHANGE
2013-01-04 17:20:57 +01:00
Bastien Guerry 5e17a990f5 org.texi (Storing searches): Add index entries and a note about {*-tree} agenda views
* org.texi (Storing searches): Add index entries and a note
about {*-tree} agenda views.

Thanks to Alan Schmitt for indirectly pointing at this doc problem.
2013-01-04 17:14:25 +01:00
Samuel Loury 3479cebca6 Fix an error introduced in 502e538020, org-make-link was replaced by contact instead of concat as the comment suggested
* org-git-link.el (org-git-create-git-link): Replace contact call by concat
	* org-bookmark.el (org-bookmark-store-link): Replace contact call by concat

TINYCHANGE
2013-01-04 16:39:35 +01:00
Bastien Guerry 9c7fa8cca9 Merge branch 'maint' 2013-01-03 13:37:13 +01:00
Bastien Guerry 7716b9c890 org-mobile.el (org-mobile-create-index-file): Possibly normalize `org-todo-keywords'
* org-mobile.el (org-mobile-create-index-file): Possibly
normalize `org-todo-keywords'.

Thanks to Ben Finney (and others) for reporting this.
2013-01-03 13:22:05 +01:00
Bastien Guerry fc65e379b0 org-mobile.el (org-mobile-allpriorities): New option
* org-mobile.el (org-mobile-allpriorities): New option.
(org-mobile-create-index-file): Use the new option.

Thanks to J. David Boyd for pointing this.
2013-01-03 13:07:08 +01:00
Bastien Guerry 3f4ad90975 org-mobile.el (org-mobile-push): Use the correct agenda buffer names
* org-mobile.el (org-mobile-push): Use the correct agenda
buffer names.

Thanks to Ramon Diaz-Uriarte for reporting this issue.
2013-01-03 12:39:58 +01:00
Bastien Guerry ab17f9959e Merge branch 'maint' 2013-01-02 23:54:12 +01:00
Bastien Guerry 56b47cd0fe org-latex.el (org-export-latex-inline-images): New option
* org-latex.el (org-export-latex-inline-images): New option.

This fixes a bug introduced in 4aaf1a, as
`org-export-latex-inline-images' is now needed.
Thanks to Gary Oberbrunner for reporting this
and to Nick Dokos for pointing at the problem.
2013-01-02 23:50:18 +01:00
Bastien Guerry fd0380b52f org.el (org-store-link): Use `org-id-link-to-org-use-id'
* org.el (org-store-link): Use `org-id-link-to-org-use-id'
instead of the obsolete variable name.
2013-01-02 23:46:14 +01:00
Bastien Guerry c1934ccfb4 org.el (org-fontify-meta-lines-and-blocks-1): Fix bug when fontifying keywords with no value
* org.el (org-fontify-meta-lines-and-blocks-1): Fix bug when
fontifying keywords with no value.
2013-01-02 23:43:53 +01:00
Bastien Guerry af5514b848 Merge branch 'maint' 2013-01-02 10:48:06 +01:00
Bastien Guerry 68acb955f1 org.el: Various fixes to the org-goto interface
* org.el (org-goto-auto-isearch): Enhance docstring.
(org-goto-map): Make a defun, so that the customized value of
org-goto-auto-isearch is correctly initialized.
(org-goto): Initialize the keymap with `org-goto-map'.
(org-get-location): Use *Org Help* as a temporary buffer.
Tell whether auto-isearch is on or off.

Thanks to Tyler Smith for reporting this.
2013-01-02 10:47:59 +01:00
Daniel Clemente d8ad57d4f7 org-contacts.el (org-contacts-format-name): New function
* org-contacts.el (org-contacts-format-name): New function.
(org-contacts-format-email): Use the new function.

TINYCHANGE
2013-01-02 10:22:25 +01:00
Bastien Guerry a584268071 Merge branch 'maint' 2013-01-02 00:32:44 +01:00
Bastien Guerry 6272ff2d18 Fix number of arguments for org-export-as-org/docbook
* org-exp.el (org-export-as-org): Remove useless
argument.

* org-docbook.el (org-export-as-docbook-batch)
(org-export-region-as-docbook, org-export-as-docbook-pdf): Fix
the number of arguments.
(org-export-as-docbook): Remove useless argument.

Thanks to George McNinch for reporting this.
2013-01-02 00:32:35 +01:00
Bastien Guerry fb8ba17e69 Merge branch 'maint' 2013-01-01 23:49:16 +01:00
Bastien Guerry 2718888f8e Fix behavior of `org-forward/backward-h-s-l' before first headline
* org.el (org-forward-heading-same-level): Before the first
headline, go to the first headline.
(org-backward-heading-same-level): Before the first headline,
go to the beginning of the buffer, like
`outline-previous-visible-heading' does.
2013-01-01 23:49:12 +01:00
Bastien Guerry a9ece57df8 org.el (org-speed-commands-default): Use ":" instead of ";" for `org-set-tags-command'
* org.el (org-speed-commands-default): Use ":" instead of ";"
for `org-set-tags-command', which is consistent with ":" in
agenda view.  Use "=" for `org-columns".

Thanks to Alan Schmitt for pointing this.
2013-01-01 23:43:34 +01:00
Bastien Guerry bc0b221203 Merge branch 'maint' 2013-01-01 17:40:31 +01:00
Bastien Guerry fc2aae5d81 org.el (org-sparse-tree): Fix redundant information in prompt
* org.el (org-sparse-tree): Fix redundant information in prompt.
2013-01-01 17:40:13 +01:00
Bastien Guerry 55e1489d98 Merge branch 'maint' 2013-01-01 17:35:50 +01:00
Bastien Guerry 0f2bb6a56f org-exp.el (org-export-string): Fix number of arguments passed to the org-export-as-* functions.
* org-exp.el (org-export-string): Fix number of arguments
passed to the org-export-as-* functions.

This fixes commit 43a242, thanks to George McNinch for reporting this.
2013-01-01 17:35:35 +01:00
Bastien Guerry dbd84ad655 org-latex.el (org-export-as-latex): Fix typo in docstring
* org-latex.el (org-export-as-latex): Fix typo in docstring.
2013-01-01 17:29:54 +01:00
Bastien Guerry b6615d0179 Merge branch 'maint' 2013-01-01 17:11:12 +01:00
Bastien Guerry f1067fb47c org-list.el (org-cycle-include-plain-lists): Docstring enhancement
* org-list.el (org-cycle-include-plain-lists): Docstring
enhancement.

Thanks to James Harkins for raising this issue.
2013-01-01 16:31:26 +01:00
Bastien Guerry 4aaf1a4df2 Don't use `org-export-html-inline-images' to set the :inline-images property
* org-exp.el (org-export-plist-vars): Don't use
`org-export-html-inline-images' to set the :inline-images
property, use distinct properties for the various backends.

* org-publish.el (org-publish-project-alist): Ditto.

* org-latex.el (org-export-latex-links): Use
:latex-inline-images instead of :inline-images.
2013-01-01 16:27:15 +01:00
Bastien Guerry 60b23bdeac Merge branch 'maint'
Conflicts:
	contrib/lisp/htmlize.el
	etc/schema/od-manifest-schema-v1.2-os.rnc
	etc/schema/od-schema-v1.2-os.rnc
	lisp/org-exp-blocks.el
2013-01-01 16:06:17 +01:00
Bastien Guerry 98cd4687a2 Update copyright years.
Happy new year!
2013-01-01 16:04:24 +01:00
Bastien Guerry bd7c2a59e8 Merge branch 'maint' 2012-12-31 15:12:16 +01:00
Bastien Guerry 841a81007d Revert "org.el (org-fontify-meta-lines-and-blocks-1): Fix fontification bug"
This reverts commit 001b6d1ebd.
2012-12-31 15:12:09 +01:00
Bastien Guerry bf537b5139 Merge branch 'maint' 2012-12-31 11:29:26 +01:00
Bastien Guerry 001b6d1ebd org.el (org-fontify-meta-lines-and-blocks-1): Fix fontification bug
* org.el (org-fontify-meta-lines-and-blocks-1): Fix
fontification bug when fontifying a keyword with no associated
value.
2012-12-31 11:29:17 +01:00
Bastien Guerry 6fd066fb18 Merge branch 'maint' 2012-12-31 11:07:06 +01:00
Bastien Guerry 61993bc4bf org.el (org-cycle-internal-local): Don't run hooks when cycling a plain list before first headline
* org.el (org-cycle-internal-local): Don't run hooks when
cycling a plain list before first headline.
2012-12-31 11:06:55 +01:00
Bastien Guerry 6a758e26ff Merge branch 'maint' 2012-12-31 09:30:19 +01:00
Bastien Guerry a62beff06d org.el (org-ctrl-c-ctrl-c): Throw a user error when trying to toggle a blocked checkbox
* org.el (org-ctrl-c-ctrl-c): Throw a user error when trying
to toggle a blocked checkbox.
2012-12-31 09:29:45 +01:00
Bastien Guerry aa80e441dc org.el (org-indent-line): Fix table formulas indenting
* org.el (org-indent-line): Fix table formulas indenting.
2012-12-31 09:29:18 +01:00
Bastien Guerry 8897a53ff4 org-agenda.el (org-agenda-open-link): Fix bug when no link is matched
* org-agenda.el (org-agenda-open-link): Fix bug when no link
is matched.  Return a message instead of an error.
2012-12-31 09:29:14 +01:00
Bastien Guerry 839c8cdd14 Merge branch 'maint' 2012-12-30 11:35:19 +01:00
Bastien Guerry e8aaca4de6 org-agenda.el (org-agenda-priority): Fix showing priority in agenda buffers
* org-agenda.el (org-agenda-priority): Remove useless
parameter and fix showing priority in agenda buffers.

Thanks to Michael Brand for reporting this.
2012-12-30 11:30:21 +01:00
Bastien Guerry 37e562460d org-e-odt.el (org-compat): Require
* org-e-odt.el (org-compat): Require.
2012-12-30 11:05:57 +01:00
Bastien Guerry d46f0e4072 org-odt.el (org-compat): Require
* org-odt.el (org-compat): Require.
2012-12-30 11:05:38 +01:00
Bastien Guerry e1c491e72d org.el (org-parse-time-string): Parse <+1w> and friends
* org.el (org-parse-time-string): Allow strings supported by
tags/properties matcher (eg <now>, <yesterday>, <-7d>).

* test-org.el (test-org/org-parse-time-string): New test.

This is based on Ilya's commit 001bcb9.  This commit was
wrong because active timestamps were not parsed correctly
anymore.  This commit handles them correctly.

Thanks to Ivan Vilata i Balaguer for pushing this forward.
2012-12-30 10:27:02 +01:00
Bastien Guerry 460c4d4ed0 Merge branch 'maint' 2012-12-30 01:21:32 +01:00
Bastien Guerry 14c3635a0d New macro `org-with-buffer-modified-unmodified'
* org-macs.el (org-with-buffer-modified-unmodified): New
macro.

* org.el (org-entry-blocked-p): Use the new macro.

Thanks to Nick Dokos for reporting this.

The macro is a copy of `with-buffer-modified-unmodified'
which (wrongly?) lives in bookmark.el.
2012-12-30 01:21:27 +01:00
Bastien Guerry b5f93f8fe3 New option `org-clock-rounding-minutes'
* org-clock.el (org-clock-rounding-minutes): New option to
round the time by N minutes in the past when clocking in or out.
(org-clock-in, org-clock-in-last, org-clock-out): Use the new
option.

* org.el (org-current-time): New optional parameter
`rounding-minutes' to override the use of
`org-time-stamp-rounding-minutes' for rounding.

Thanks to Kevin Buchs for a preliminary patch for this feature.
2012-12-29 18:45:07 +01:00
Michael Brand a77442b37b Use nan for empty fields in Calc formulas
* doc/org.texi (Formula syntax for Calc): Add explanation and example
for empty field.
* lisp/org-table.el (org-table-eval-formula): Use `keep-empty' in more
places.
(org-table-make-reference): Use nan (not a number) for empty fields in
Calc formulas.
* testing/lisp/test-org-table.el: Adapt expected for several
ert-deftest.
(test-org-table/empty-field): New examples dealing with empty fields.
(test-org-table/copy-field): New ert-deftest with examples dealing with
empty fields.

This makes it possible to write spreadsheet Calc formulas that check
for empty fields:  To sum the first two columns unless one or both
empty:
$3 = if("$1" = "nan" || "$2" = "nan", string(""), $1 + $2); E
2012-12-29 14:33:52 +01:00
Michael Brand 764315b3fc org-table.el: Fix range len bugs and inconsistencies
* lisp/org-table.el (org-table-eval-formula): Keep empty fields during
preprocessing.
(org-table-make-reference): A range with only empty fields should not
always return 0 but also empty string, consistent with field reference
of an empty field.  Use future design for nan but replicate current
behavior.
* testing/lisp/test-org-table.el: Adapt expected for several
ert-deftest.

The range len bugs may lead to wrong calculations for range references
with empty fields when the range len is relevant.  Affects typically
Calc vmean on simple range and without format specifier EN.  Also
Lisp with e. g. `length' on simple range or with L.
2012-12-29 14:33:52 +01:00