diff options
author | Bastien <bzg@gnu.org> | 2020-02-17 14:22:30 +0100 |
---|---|---|
committer | Bastien <bzg@gnu.org> | 2020-02-17 14:22:30 +0100 |
commit | fb188adda0ef3a25c8c74216aabcd81cdda4099a (patch) | |
tree | 60a2b043e405514b3bdb239b4d6960e012e553bf | |
parent | dfa7a3397b8fac37a5f9e6a71b37c260c308cf6a (diff) | |
download | org-mode-fb188adda0ef3a25c8c74216aabcd81cdda4099a.tar.gz |
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.
-rw-r--r-- | lisp/org-agenda.el | 10 | ||||
-rw-r--r-- | lisp/org.el | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index a78b98a..7b96298 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 403c7bd..f7547eb 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" |