mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-27 00:02:51 +00:00
Merge branch 'for-carsten' of git://git.norang.ca/org-mode
This commit is contained in:
commit
f116b0f325
|
@ -694,7 +694,7 @@ also indented so that it starts in the same column as the headline
|
||||||
See also the variable `org-reverse-note-order'."
|
See also the variable `org-reverse-note-order'."
|
||||||
(when (and (equal current-prefix-arg 2)
|
(when (and (equal current-prefix-arg 2)
|
||||||
(not (marker-buffer org-clock-marker)))
|
(not (marker-buffer org-clock-marker)))
|
||||||
(error "No runing clock"))
|
(error "No running clock"))
|
||||||
(when (org-bound-and-true-p org-jump-to-target-location)
|
(when (org-bound-and-true-p org-jump-to-target-location)
|
||||||
(let* ((end (min (point-max) (1+ (point))))
|
(let* ((end (min (point-max) (1+ (point))))
|
||||||
(beg (point)))
|
(beg (point)))
|
||||||
|
|
|
@ -12596,9 +12596,10 @@ This command does many different things, depending on context:
|
||||||
- If the cursor is inside a table created by the table.el package,
|
- If the cursor is inside a table created by the table.el package,
|
||||||
activate that table.
|
activate that table.
|
||||||
|
|
||||||
- If the current buffer is a remember buffer, close note and file it.
|
- If the current buffer is a remember buffer, close note and file
|
||||||
with a prefix argument, file it without further interaction to the default
|
it. A prefix argument of 1 files to the default location
|
||||||
location.
|
without further interaction. A prefix argument of 2 files to
|
||||||
|
the currently clocking task.
|
||||||
|
|
||||||
- If the cursor is on a <<<target>>>, update radio targets and corresponding
|
- If the cursor is on a <<<target>>>, update radio targets and corresponding
|
||||||
links in this buffer.
|
links in this buffer.
|
||||||
|
|
Loading…
Reference in a new issue