summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2019-01-13 00:13:46 -0500
committerKyle Meyer <kyle@kyleam.com>2019-01-13 00:13:46 -0500
commit6972cce38bb9b486bc3238d77c808d523b4c8900 (patch)
tree39f51f641bf6ea9d12dd683c71a92a729c27ea75
parentcbc43c1f015555a5616e8a47f51b3e8c05de2e28 (diff)
parentf3584ecc3b437a53da4ecfe5c7e04a4d8f659ad5 (diff)
downloadorg-mode-6972cce38bb9b486bc3238d77c808d523b4c8900.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-clock.el4
-rw-r--r--lisp/org.el2
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 4dacef9..4eac314 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -928,7 +928,9 @@ CLOCK is a cons cell of the form (MARKER START-TIME)."
;; contents, and leave point on the /next/ headline. We store
;; the current entry location to be able to get back here when
;; we need to clock in again the previously clocked task.
- (heading (org-with-point-at (car clock) (org-back-to-heading t))))
+ (heading (org-with-point-at (car clock)
+ (org-back-to-heading t)
+ (point-marker))))
(pcase resolve-to
(`nil
(org-clock-clock-cancel clock)
diff --git a/lisp/org.el b/lisp/org.el
index dea584a..dda91d2 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -9626,7 +9626,7 @@ If the DEFAULT-DESCRIPTION parameter is non-nil, this value will
be used as the default description. Otherwise, if
`org-make-link-description-function' is non-nil, this function
will be called with the link target, and the result will be the
-default link description. When called non-interactivily, don't
+default link description. When called non-interactively, don't
allow to edit the default description."
(interactive "P")
(let* ((wcf (current-window-configuration))