mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-07-17 03:36:27 +00:00
Code Releases Activity

Merge branch 'for-carsten' of git://git.norang.ca/org-mode

Browse source
This commit is contained in:
Carsten Dominik 2008-10-28 20:10:00 +01:00
parent 13d2cb4638 cbc72efe27
commit f116b0f325
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/org-remember.el
View file

@ -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'."
(when (and (equal current-prefix-arg 2)
(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)
(let* ((end (min (point-max) (1+ (point))))
(beg (point)))

7
lisp/org.el
View file

@ -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,
activate that table.
- If the current buffer is a remember buffer, close note and file it.
with a prefix argument, file it without further interaction to the default
location.
- If the current buffer is a remember buffer, close note and file
it. A prefix argument of 1 files to the default 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
links in this buffer.