mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-22 23:48:33 +00:00
Merge branch 'maint'
This commit is contained in:
commit
75400198ef
|
@ -16126,7 +16126,8 @@ So these are more for recording a certain time/date."
|
|||
(defvar org-read-date-inactive)
|
||||
|
||||
(defvar org-read-date-minibuffer-local-map
|
||||
(let ((map (make-sparse-keymap)))
|
||||
(let* ((org-replace-disputed-keys nil)
|
||||
((map (make-sparse-keymap))))
|
||||
(set-keymap-parent map minibuffer-local-map)
|
||||
(org-defkey map (kbd ".")
|
||||
(lambda () (interactive)
|
||||
|
@ -16286,7 +16287,6 @@ user."
|
|||
(calendar-current-date))))
|
||||
(org-eval-in-calendar nil t)
|
||||
(let* ((old-map (current-local-map))
|
||||
(org-replace-disputed-keys nil)
|
||||
(map (copy-keymap calendar-mode-map))
|
||||
(minibuffer-local-map
|
||||
(copy-keymap org-read-date-minibuffer-local-map)))
|
||||
|
|
Loading…
Reference in a new issue