diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index a78b98a47..7b9629821 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -1243,6 +1243,16 @@ in the past." :version "24.1" :type 'boolean) +(defcustom org-agenda-diary-file 'diary-file + "File to which to add new entries with the `i' key in agenda and calendar. +When this is the symbol `diary-file', the functionality in the Emacs +calendar will be used to add entries to the `diary-file'. But when this +points to a file, `org-agenda-diary-entry' will be used instead." + :group 'org-agenda + :type '(choice + (const :tag "The standard Emacs diary file" diary-file) + (file :tag "Special Org file diary entries"))) + (defcustom org-agenda-include-diary nil "If non-nil, include in the agenda entries from the Emacs Calendar's diary. Custom commands can set this variable in the options section." diff --git a/lisp/org.el b/lisp/org.el index 403c7bd95..f7547eba1 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -3268,16 +3268,6 @@ A nil value means to remove them, after a query, from the list." :group 'org-agenda :type 'boolean) -(defcustom org-agenda-diary-file 'diary-file - "File to which to add new entries with the `i' key in agenda and calendar. -When this is the symbol `diary-file', the functionality in the Emacs -calendar will be used to add entries to the `diary-file'. But when this -points to a file, `org-agenda-diary-entry' will be used instead." - :group 'org-agenda - :type '(choice - (const :tag "The standard Emacs diary file" diary-file) - (file :tag "Special Org file diary entries"))) - (defgroup org-latex nil "Options for embedding LaTeX code into Org mode." :tag "Org LaTeX"