summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-10 11:15:37 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-01-10 11:15:37 (GMT)
commit67e83a10c8ba6a67e5f31c9ab70c488419a04cf2 (patch)
treed4851a373203365ec71a98f468f5a6f4807733a3
parentda0276cba51a545773bc43613d83da136c61e854 (diff)
parent8b0fe31386939c02bcbcba7e1c5ea69858e50aa8 (diff)
downloadorg-mode-67e83a10c8ba6a67e5f31c9ab70c488419a04cf2.zip
org-mode-67e83a10c8ba6a67e5f31c9ab70c488419a04cf2.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-agenda.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 0f392c1..e8e1b0e 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -5025,7 +5025,7 @@ of what a project is and how to check if it stuck, customize the variable
(pop-up-frames nil)
(diary-list-entries-hook
(cons 'org-diary-default-entry diary-list-entries-hook))
- (diary-file-name-prefix-function nil) ; turn this feature off
+ (diary-file-name-prefix nil) ; turn this feature off
(diary-modify-entry-list-string-function 'org-modify-diary-entry-string)
entries
(org-disable-agenda-to-diary t))