diff options
| author | Carsten Dominik <carsten.dominik@gmail.com> | 2013-09-08 07:33:34 +0200 |
|---|---|---|
| committer | Carsten Dominik <carsten.dominik@gmail.com> | 2013-09-08 07:33:34 +0200 |
| commit | 75400198ef49dcdc9d822ef74f453da6f976091a (patch) | |
| tree | 475dea4d02fb8e64ebef8e4f2ded9b74ba2c8ff1 | |
| parent | 9a0e84fbd7b0e25cf49613e787d572f3c71723dc (diff) | |
| parent | e8023dde58f267a525b63184ec07d371b5a4c8b5 (diff) | |
| download | org-mode-75400198ef49dcdc9d822ef74f453da6f976091a.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org.el b/lisp/org.el index aebf58f..84c1935 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -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))) |