diff options
| author | Eric Schulte <schulte.eric@gmail.com> | 2011-05-06 14:47:31 -0600 |
|---|---|---|
| committer | Eric Schulte <schulte.eric@gmail.com> | 2011-05-06 14:47:31 -0600 |
| commit | e80305e77e039503133f8efe4aee09f5445010d2 (patch) | |
| tree | 2c48f47796924e88bf136f3cb79367b2b8f1c524 | |
| parent | ec293ae62b1d92a45b752beb29b9d4163c04c573 (diff) | |
| parent | eb2a890f105c8b2f96595e6f2d1fc0feab42aae2 (diff) | |
| download | org-mode-e80305e77e039503133f8efe4aee09f5445010d2.tar.gz | |
Merge branch 'master' of orgmode.org:org-mode
| -rw-r--r-- | doc/org.texi | 2 | ||||
| -rw-r--r-- | lisp/org.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/org.texi b/doc/org.texi index f9131e2..844de6d 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -4770,7 +4770,7 @@ CLOSED @r{When was this entry closed?} TIMESTAMP @r{The first keyword-less timestamp in the entry.} TIMESTAMP_IA @r{The first inactive timestamp in the entry.} CLOCKSUM @r{The sum of CLOCK intervals in the subtree. @code{org-clock-sum}} - @r{must be run first to compute the values.} + @r{must be run first to compute the values in the current buffer.} BLOCKED @r{"t" if task is currently blocked by children or siblings} ITEM @r{The content of the entry.} FILE @r{The filename the entry is located in.} diff --git a/lisp/org.el b/lisp/org.el index cd0065a..acbb261 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -13439,7 +13439,7 @@ a *different* entry, you cannot use these techniques." (defconst org-special-properties '("TODO" "TAGS" "ALLTAGS" "DEADLINE" "SCHEDULED" "CLOCK" "CLOSED" "PRIORITY" - "TIMESTAMP" "TIMESTAMP_IA" "BLOCKED" "FILE") + "TIMESTAMP" "TIMESTAMP_IA" "BLOCKED" "FILE" "CLOCKSUM") "The special properties valid in Org-mode. These are properties that are not defined in the property drawer, |