diff options
author | Bastien Guerry <bzg@altern.org> | 2013-02-20 16:31:17 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2013-02-20 16:31:17 +0100 |
commit | f35e82641c02e4b406801f76060ffbf5617abfb6 (patch) | |
tree | 0c5a8d1b4407a529f6e79d5598f1d065509cf904 | |
parent | 272ca457016f95de902db9983bb9be9ce3238304 (diff) | |
parent | 9a21403bd7d02c5b0d29feab475712ef162e974a (diff) | |
download | org-mode-f35e82641c02e4b406801f76060ffbf5617abfb6.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-agenda.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 7de5df3..df81047 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -9887,7 +9887,7 @@ By default `org-agenda-to-appt' will use :deadline, :scheduled and :timestamp entries. See the docstring of `org-diary' for details and examples. -If an entry as a APPT_WARNTIME property, its value will be used +If an entry has a APPT_WARNTIME property, its value will be used to override `appt-message-warning-time'." (interactive "P") (if refresh (setq appt-time-msg-list nil)) @@ -9976,7 +9976,7 @@ By default `org-agenda-to-appt' will use :deadline, :scheduled and :timestamp entries. See the docstring of `org-diary' for details and examples. -If an entry as a APPT_WARNTIME property, its value will be used +If an entry has a APPT_WARNTIME property, its value will be used to override `appt-message-warning-time'. \(fn &optional REFRESH FILTER &rest ARGS)" t nil) |