Commit Graph

12629 Commits

Author SHA1 Message Date
Bastien Guerry daa35c0c68 Merge branch 'maint' 2013-01-08 08:04:36 +01:00
Bastien Guerry 44d1a69eab org.el (org-setup-filling): Set `auto-fill-inhibit-regexp' from `org-outline-regexp'
* org.el (org-setup-filling): Set `auto-fill-inhibit-regexp'
from `org-outline-regexp'.

Thanks to John Hendy for reporting a problem in this area.
2013-01-08 08:04:24 +01:00
Eric Schulte 5328e1cd02 no hline pre-processing for elisp code blocks
* doc/org.texi (hlines): Note that :hline has no effect for Emacs Lisp
  code blocks.
2013-01-07 23:38:15 -07:00
Bastien Guerry 45ed388387 Merge branch 'maint' 2013-01-08 00:00:03 +01:00
David Engster 195173eef0 org-icalendar.el (org-icalendar-ts-to-string): Fix bug in converting timezone
org-icalendar.el (org-icalendar-ts-to-string): Fix bug in converting
timezone.

TINYCHANGE
2013-01-07 23:59:30 +01:00
Bastien Guerry 7feec64988 Merge branch 'maint' 2013-01-07 22:29:11 +01:00
Bastien Guerry 55a4789661 etc/ORG-NEWS: Add information about Org 7.9.3 2013-01-07 22:28:54 +01:00
Bastien Guerry 3d1c9a42c3 org-agenda.el (org-agenda-use-tag-inheritance): Fix custom definition
* org-agenda.el (org-agenda-use-tag-inheritance): Fix custom
definition.
2013-01-07 22:02:33 +01:00
Bastien Guerry 68c1ad99ea New option `org-time-clocksum-use-effort-durations'
* org.el (org-time-clocksum-format): Add a version tag and add
to the 'org-clock group.
(org-time-clocksum-use-fractional): Ditto.
(org-time-clocksum-use-effort-durations): New option to allow
using `org-effort-durations' when computing clocksum durations.
(org-minutes-to-clocksum-string): Use the new option.

* org-clock.el (org-clocktable-write-default): Let-bind
`org-time-clocksum-use-effort-durations' to a new clocktable
parameter ":effort-durations".

Thanks to Sébastien Vauban for pointing the inconsistency.
2013-01-07 21:44:00 +01:00
Bastien Guerry 5c8cc17d39 Merge branch 'maint' 2013-01-07 18:21:39 +01:00
Bastien Guerry 571d80dad9 org.texi (Pushing to MobileOrg): Fix footnote about the use of symbolic links in `org-directory'
* org.texi (Pushing to MobileOrg): Fix footnote about the use
of symbolic links in `org-directory'.
2013-01-07 18:21:29 +01:00
Bastien Guerry 0de96daa95 org.el (org-entry-get): Speed up by let-binding some variables only if needed
* org.el (org-entry-get): Speed up by let-binding some
variables only if needed.  Also fix a bug: consider an empty
drawer as no drawer.

Thanks to William Léchelle for reporting this.
2013-01-07 18:18:27 +01:00
Bastien Guerry b54d6f5965 Merge branch 'maint'
Conflicts:
	lisp/org-agenda.el
	lisp/org.el
	testing/lisp/test-org-element.el
2013-01-07 16:19:37 +01:00
Bastien Guerry c8bfd50223 org-agenda.el: New option `org-agenda-use-tag-inheritance'
* org-agenda.el (org-search-view, 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-change-all-lines): Get local tags only.
(org-agenda-use-tag-inheritance): New option.
(org-agenda-finalize): When `org-agenda-use-tag-inheritance'
is non-nil, possibly reset tags in the agenda buffer.
(org-agenda-check-type): Enhance docstring.

See the docstring of the new option for details.
2013-01-07 16:12:52 +01:00
Bastien Guerry babba02750 org.el (org-use-tag-inheritance): Fix typo in docstring
* org.el (org-use-tag-inheritance): Fix typo in docstring.
2013-01-07 13:47:59 +01:00
Bastien Guerry b27a020a83 `org-float' is now obsolete
* org-agenda.el (org-float): Don't alias `org-float'.

* org.texi (Timestamps, Deadlines and scheduling): Use
`diary-float' instead of the now obsolete alias `org-float'.

* test-org-element.el
(test-org-element/timestamp-interpreter): Ditto.
2013-01-07 13:01:36 +01:00
Bastien Guerry aaf14258eb org.el (org-scan-tags): The skipper already checks for archived entries
* org.el (org-scan-tags): The skipper already checks for
archived entries.
2013-01-07 12:57:27 +01:00
Bastien Guerry e4df4e9ffd org-clock.el: Fix last commit. 2013-01-07 12:52:34 +01:00
Bastien Guerry 6cd243468b Speed up setting/getting the APPT_WARNTIME property.
* org.el (org-refresh-properties): Rename from
`org-refresh-effort-properties' and use two new parameters.
(org-agenda-prepare-buffers): Use `org-refresh-properties'.
Also refresh the 'org-appt-warntime text property.

* org-clock.el (org-clock-in): Use the renamed defun.

* org-icalendar.el (org-icalendar-print-entries): Refresh the
'org-appt-warntime property.
(org-icalendar-print-entries): Do not use `org-entry-get' to
get the "APPT_WARNTIME" property value.

* org-agenda.el (org-agenda-get-timestamps)
(org-agenda-get-sexps, org-agenda-get-deadlines)
(org-agenda-get-scheduled): Ditto.
2013-01-07 12:50:49 +01:00
Bastien Guerry 334596e3c7 org.el (org-adaptive-fill-function): Fix checking of post-affiliated
* org.el (org-adaptive-fill-function): Fix checking of
post-affiliated.
(org-id-link-to-org-use-id): Fix compiler warning.
2013-01-07 12:39:09 +01:00
Bastien Guerry 8f749c9834 org-depend.el (org-depend-trigger-todo): Refresh effort text properties
* org-depend.el (org-depend-trigger-todo): Refresh effort text
properties.  Do not use `org-get-effort' for getting the
effort property value.
2013-01-07 12:33:57 +01:00
Bastien Guerry c4d4bf3833 New defun `org-refresh-effort-properties'
* org-agenda.el (org-agenda-format-item): Do not use
org-get-effort to get the effort text property.
(org-agenda-get-sexps): Use `org-back-to-heading' when setting
the tags.

* org-clock.el (org-clock-in): Refresh effort properties.

* org.el (org-refresh-effort-properties): New defun.
(org-get-effort): Delete.
(org-set-effort): Set the 'org-effort text property.
(org-property-next-allowed-value): Ditto.
(org-agenda-prepare-buffers): Refresh effort properties.
2013-01-07 12:33:24 +01:00
Bastien Guerry 3a1c270607 org-entities.el (org-entities): "neg" should be used in LaTeX math mode
* org-entities.el (org-entities): "neg" should be used in LaTeX
math mode.

Thanks to Florian Beck for spotting this.
2013-01-07 00:25:58 +01:00
Achim Gratz 5484a33b8d Compatibility: Use org-load-noerror-mustsuffix
* lisp/org-macs.el: New macro to allow the 5-argument form of load to
  be used where possible without breaking compatibility with XEmacs.

* lisp/org.el (org-version, org-reload): Use
  `org-load-noerror-mustsuffix´ instead of adding a fifth argument to
  load directly.  Guard against undefined variable load-suffixes,
  which doesn't exist in XEmacs.

Since load-suffixes doesn't exist in XEmacs, (org-reload 'uncompiled)
will not work.  If it doesn't complicate the compatibility macro too
much this can be added later.
2013-01-06 18:33:34 +01:00
Achim Gratz 8fcdb5179b Compatibility: Use org-define-obsolete-{function,variable}-alias
* lisp/org.el: Use
  `org-define-obsolete-{function,variable}-alias´instead of
  `define-obsolate{function,variable}-alias´.
2013-01-06 18:33:23 +01:00
Achim Gratz 19460418a0 Merge branch 'maint' 2013-01-06 18:33:16 +01:00
Achim Gratz 305f29776f Compatibility: Use org-define-obsolete-{function,variable}-alias
* lisp/org-compat.el (org-define-obsolete-function-alias,
  org-define-obsolete-variable-alias): Introduce new compatibility
  macros to obsolete functions and variables.

* lisp/org-agenda.el, lisp/org-clock.el, lisp/org-id.el,
  lisp/org-lparse.el, lisp/org-protocol.el lisp/org.el: Use
  `org-define-obsolete-{function,variable}-alias´instead of
  `define-obsolate{function,variable}-alias´.
2013-01-06 18:29:05 +01:00
Achim Gratz d524e7d611 Compatibility: Define face alias mode-line for XEmacs
* lisp/org-faces.el: Define face alias mode-line for XEmacs (it's
  called modeline there).
2013-01-06 18:28:24 +01:00
Achim Gratz 4e2f6d7d8f Compatibility: Use org-no-warnings
* contrib/lisp/org-e-odt.el (org-e-odt-htmlfontify-string): Use
  compatibility alias `org-no-warnings´.
2013-01-06 18:28:06 +01:00
Bastien Guerry b43ee80cb8 Merge branch 'maint' 2013-01-06 15:10:52 +01:00
Bastien Guerry 50ba6031c4 Backport patch from revno#r111145 from the Emacs-24 branch 2013-01-06 15:05:35 +01:00
Bastien Guerry 0c75ce3034 Merge branch 'maint' 2013-01-06 14:56:50 +01:00
Bastien Guerry 76684b5606 org.texi (Pushing to MobileOrg): Mention that `org-directory' should not contain symbolic links
* org.texi (Pushing to MobileOrg): Mention that `org-directory'
should not contain symbolic links.

Thanks to James Harkins for reporting this problem.
2013-01-06 14:56:36 +01:00
Bastien Guerry 8c5b47935f Merge branch 'maint' 2013-01-06 12:46:33 +01:00
Bastien Guerry 7b26ec60a9 Merge branch 'maint-agenda-optimization' into maint 2013-01-06 12:46:25 +01:00
Bastien Guerry b75b46620b org-entities.el (org-entities): Add the "neg" entity
* org-entities.el (org-entities): Add the "neg" entity.

Thanks to Florian beck for triggering this issue.
2013-01-06 12:38:45 +01:00
Bastien Guerry 47583ba1e4 org.el (org-read-date): Let-bind `mouse-autoselect-window' to nil
* org.el (org-read-date): Let-bind `mouse-autoselect-window'
to nil so that the mouse doesn't jump when the option is set
to t globally.

Thanks to E Sabof for reporting this.
2013-01-06 12:37:18 +01:00
Bastien Guerry d621d2eac3 New default value nil for `org-agenda-dim-blocked-tasks'
* org-agenda.el (org-agenda-dim-blocked-tasks): Default to
nil.
(org-agenda-dim-blocked-tasks): Make interactive and allow an
optional parameter 'invisible to hide blocked tasks instead of
just dimming them.
(org-agenda-mode-map): Bind `org-agenda-dim-blocked-tasks' to
"#".

With a default value of t for `org-agenda-dim-blocked-tasks',
any non-nil value for `org-enforce-todo-checkbox-dependencies' or
`org-enforce-todo-dependencies' (or both) will slow down the
agenda generation too much, which might surprise the user.
2013-01-06 12:31:20 +01:00
Bastien Guerry 806a141f1e org-agenda.el (org-agenda-finalize): Don't try to align tags when there are no tags
* org-agenda.el (org-agenda-finalize): Don't try to align tags
when there are no tags.
2013-01-06 09:20:30 +01:00
Bastien Guerry cd00d36ca2 org-agenda.el (org-agenda-finalize): Only try to draw the habit consistency graph when there is a habit in the buffer
* org-agenda.el (org-agenda-finalize): Only try to draw the
habit consistency graph when there is a habit in the buffer.
2013-01-06 09:14:54 +01:00
Bastien Guerry f1191b86e3 org-agenda.el (org-agenda-finalize): Only mark clocking task when there is one
* org-agenda.el (org-agenda-finalize): Only mark clocking task
when there is one.
2013-01-06 09:11:08 +01:00
Bastien Guerry 5352d9b155 Merge branch 'maint' 2013-01-06 07:40:36 +01:00
Bastien Guerry 129ecf99fa org.texi (TODO basics): Fix description of TODO keywords cycling
* org.texi (TODO basics): Add `org-use-fast-todo-selection' to
the variable index.
(TODO basics): Fix description of TODO keywords cycling.

Thanks to Brian van den Broek for reporting this.
2013-01-06 07:36:36 +01:00
Bastien Guerry 8a401f8175 Merge branch 'maint' 2013-01-06 06:17:18 +01:00
Bastien Guerry bbc9ea09e4 Revert "Backport revno#111138 from the emacs-24 branch"
This reverts commit 7fe67bb942.

Thanks to Takaaki ISHIKAWA for reporting this.
Also see http://mid.gmane.org/fkobh39l4z.fsf%40fencepost.gnu.org
2013-01-06 06:15:30 +01:00
Bastien Guerry 5217d18a7a Merge branch 'maint' 2013-01-05 18:39:48 +01:00
Bastien Guerry 7fe67bb942 Backport revno#111138 from the emacs-24 branch
* org.texi (Advanced features): Add missing argument for @item.
(Property searches): Use @backslashchar{} in macro argument.
2013-01-05 18:39:40 +01:00
Bastien Guerry 8d7990acfa Merge branch 'maint'
Conflicts:
	lisp/org.el
2013-01-05 17:29:06 +01:00
Bastien Guerry cad0b388dd org.el (org-adaptive-fill-function): DTRT in `message-mode'
* org.el (org-adaptive-fill-function): DTRT in `message-mode'.

This is too hackish, but do the job for now.  Instead of
having exceptions for `message-mode' filling wrapped into
org-*-fill* functions, we should let orgstruct++-mode do
this job.
2013-01-05 17:23:34 +01:00
Bastien Guerry 5c2dd988a5 Merge branch 'maint' 2013-01-04 18:15:56 +01:00