org.el: Move `org-agenda-diary-file' to org-agenda.el

* lisp/org-agenda.el (org-agenda-diary-file): Move from org.el.
* lisp/org-colview.el (org-agenda-diary-file): Move to org-agenda.el.
This commit is contained in:
Bastien 2020-02-17 14:22:30 +01:00
parent dfa7a3397b
commit fb188adda0
2 changed files with 10 additions and 10 deletions

View File

@ -1243,6 +1243,16 @@ in the past."
:version "24.1" :version "24.1"
:type 'boolean) :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 (defcustom org-agenda-include-diary nil
"If non-nil, include in the agenda entries from the Emacs Calendar's diary. "If non-nil, include in the agenda entries from the Emacs Calendar's diary.
Custom commands can set this variable in the options section." Custom commands can set this variable in the options section."

View File

@ -3268,16 +3268,6 @@ A nil value means to remove them, after a query, from the list."
:group 'org-agenda :group 'org-agenda
:type 'boolean) :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 (defgroup org-latex nil
"Options for embedding LaTeX code into Org mode." "Options for embedding LaTeX code into Org mode."
:tag "Org LaTeX" :tag "Org LaTeX"