summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2013-09-08 05:33:18 (GMT)
committer Carsten Dominik <carsten.dominik@gmail.com>2013-09-08 05:33:18 (GMT)
commite8023dde58f267a525b63184ec07d371b5a4c8b5 (patch)
treec087cfad98d131dc2216e4f461ab0b2eae4a3758
parent36d96356361605ec85df530d9c9620b8c06e6a2a (diff)
downloadorg-mode-e8023dde58f267a525b63184ec07d371b5a4c8b5.zip
org-mode-e8023dde58f267a525b63184ec07d371b5a4c8b5.tar.gz
Turn off replacing of disputed keys for the read-date keymap
* lisp/org.el (org-read-date-minibuffer-local-map): Don't replace disputed keys when defining this keymap. (org-read-date: Remove unnecessary binding of `org-replace-disputed-keys'. This original fix did not work, thanks to Miro Bezjak for showing what the proper fix should be.
-rw-r--r--lisp/org.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 7766277..b7d97b0 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -16120,7 +16120,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)
@@ -16280,7 +16281,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)))