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.

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 2eb96c2..5182d8b 100644 (file)
--- 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))