ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Kyle Meyer 2019-01-13 00:13:46 -05:00
parent cbc43c1f01 f3584ecc3b
commit 6972cce38b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/org-clock.el
View File

@ -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)

2
lisp/org.el
View File

@ -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))