summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-10 11:15:24 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-01-10 11:15:24 (GMT)
commit8b0fe31386939c02bcbcba7e1c5ea69858e50aa8 (patch)
tree04d7f6dcc610164a34eec1db5b2aa25115a99d4a
parent79dd795fe4abb5fdcc1340194b25b958342b8c66 (diff)
downloadorg-mode-8b0fe31386939c02bcbcba7e1c5ea69858e50aa8.zip
org-mode-8b0fe31386939c02bcbcba7e1c5ea69858e50aa8.tar.gz
org-agenda.el (org-get-entries-from-diary): Turn off `diary-file-name-prefix'
* org-agenda.el (org-get-entries-from-diary): Turn off `diary-file-name-prefix' instead of `diary-file-name-prefix-function', the former is checked before the latter. Thanks to Andreas Merziger for reporting this as Emacs bug#13396.
-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 2eb96c2..5182d8b 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -4974,7 +4974,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))