summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-04-24 11:36:47 +0200
committerBastien Guerry <bzg@altern.org>2013-04-24 11:36:47 +0200
commite87dc9df1a2e2ded681646dfa4f17a0dd4d1f31a (patch)
tree899a98514fe82a792ff21be77050a2ac3b75a541
parent6e4ce7dc231c8615d33fb826e266ca4aaed44366 (diff)
parent253b65c0912448baeadb90d7fb2aee9a3d03ba9f (diff)
downloadorg-mode-e87dc9df1a2e2ded681646dfa4f17a0dd4d1f31a.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el6
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/org.el b/lisp/org.el
index d343e1d..c76ddd0 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -16075,9 +16075,13 @@ So these are more for recording a certain time/date."
(set-keymap-parent map minibuffer-local-map)
(org-defkey map (kbd ".")
(lambda () (interactive)
- (if (= (char-before) 32)
+ ;; Are we at the beginning of the prompt?
+ (if (looking-back "^[^:]+: ")
(org-eval-in-calendar '(calendar-goto-today))
(insert "."))))
+ (org-defkey map (kbd "C-.")
+ (lambda () (interactive)
+ (org-eval-in-calendar '(calendar-goto-today))))
(org-defkey map [(meta shift left)]
(lambda () (interactive)
(org-eval-in-calendar '(calendar-backward-month 1))))