0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-29 18:36:26 +00:00

Merge branch 'maint'

This commit is contained in:
Bastien 2020-02-02 20:08:53 +01:00
commit 4843030b45

View file

@ -94,8 +94,6 @@
(defvar org-habit-show-all-today)
(defvar org-habit-scheduled-past-days)
(org-remap org-agenda-mode-map 'move-end-of-line 'org-agenda-end-of-line)
;; Defined somewhere in this file, but used before definition.
(defvar org-agenda-buffer-name "*Org Agenda*")
(defvar org-agenda-overriding-header nil)
@ -2109,6 +2107,8 @@ evaluate to a string."
(defvar org-agenda-mode-map (make-sparse-keymap)
"Keymap for `org-agenda-mode'.")
(org-remap org-agenda-mode-map 'move-end-of-line 'org-agenda-end-of-line)
(defvar org-agenda-menu) ; defined later in this file.
(defvar org-agenda-restrict nil) ; defined later in this file.
(defvar org-agenda-follow-mode nil)