Merge branch 'maint'

2015-10-23 11:19:16 -04:00 · 2015-10-23 11:19:16 -04:00 · 666fd99175
parent 30ec973c8b 8c763ab08c
commit 666fd99175
1 changed files with 3 additions and 1 deletions
--- a/lisp/org.el
+++ b/lisp/org.el
@ -16772,7 +16772,9 @@ So these are more for recording a certain time/date."
    (org-defkey map (kbd ".")
                (lambda () (interactive)
 		  ;; Are we at the beginning of the prompt?
-		  (if (org-looking-back "^[^:]+: " (line-beginning-position))
+		  (if (org-looking-back "^[^:]+: "
+					(let ((inhibit-field-text-motion t))
+					  (line-beginning-position)))
 		      (org-eval-in-calendar '(calendar-goto-today))
 		    (insert "."))))
    (org-defkey map (kbd "C-.")