summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2009-03-25 12:01:30 +0100
committerCarsten Dominik <carsten.dominik@gmail.com>2009-03-25 12:01:30 +0100
commitb4c6dab2086c7e7b8f901e15bd7ca63af2968872 (patch)
treeb34b41a32cfd5f8d54b5690e4f3db4afe3918d2a
parentab074fdabca9a425463b3e7f80445a67e0e80cfb (diff)
downloadorg-mode-b4c6dab2086c7e7b8f901e15bd7ca63af2968872.tar.gz
Agenda: Make sure diary items are searched for a time.
The new variable `org-agenda-search-headline-for-time' also turned off time searching for diary items as an unwanted side-effect. This commit makes sure that diary entries are always parsed for a time.
-rwxr-xr-xlisp/ChangeLog1
-rw-r--r--lisp/org-agenda.el2
2 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6096d2b..39d27ba 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,7 @@
* org-agenda.el (org-agenda-get-todos): Fix bug with match-data.
(org-agenda-get-todos): Mark file tags as inherited.
+ (org-agenda-list): Always search diary lines for a time.
2009-03-24 Carsten Dominik <carsten.dominik@gmail.com>
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 61b1ba2..d013e5c 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -2753,7 +2753,7 @@ given in `org-agenda-start-on-weekday'."
:deadline :scheduled :sexp :timestamp))))
(setq rtnall (append rtnall rtn))))
(if org-agenda-include-diary
- (progn
+ (let ((org-agenda-search-headline-for-time t))
(require 'diary-lib)
(setq rtn (org-get-entries-from-diary date))
(setq rtnall (append rtnall rtn))))