Mercurial > emacs
diff lisp/org/org-clock.el @ 106022:b92e7ae35c75
2009-11-15 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-as-latex): Add the :drawers property.
2009-11-15 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-speed-commands-user): Allow documentation headlines.
(org-speed-commands-default): Organize the value of this constant
with descriptive headlines.
(org-print-speed-command): Output the headlines.
2009-11-15 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-show-outline-path): New option.
(org-agenda-do-context-action): New function.
(org-agenda-next-line, org-agenda-previous-line): Use
`org-agenda-do-context-action'.
* org.el (org-use-speed-commands): Allow function value.
(org-speed-commands-default): Make headline motion safe, so that
these commands always end on a headline.
(org-speed-commands-default): New key `v' for `org-agenda'.
(org-speed-move-safe): New function.
(org-self-insert-command): Use the function value of
`org-use-speed-commands'.
(org-get-outline-path): Improve docstring.
(org-format-outline-path): New function.
(org-display-outline-path): New function.
2009-11-15 John Wiegley <jwiegley@gmail.com>
* org-clock.el (org-clock-resolve): If `org-clock-into-string' is
a string, use that to find the LOGBOOK drawer.
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Sun, 15 Nov 2009 07:11:04 +0000 |
parents | b7d8222914b4 |
children | 83924fb4f59c |
line wrap: on
line diff
--- a/lisp/org/org-clock.el Sun Nov 15 05:16:51 2009 +0000 +++ b/lisp/org/org-clock.el Sun Nov 15 07:11:04 2009 +0000 @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33 +;; Version: 6.33c ;; ;; This file is part of GNU Emacs. ;; @@ -678,22 +678,26 @@ (save-window-excursion (save-excursion (unless org-clock-resolving-clocks-due-to-idleness - (org-with-clock clock - (org-clock-goto)) + (org-with-clock clock (org-clock-goto)) (with-current-buffer (marker-buffer (car clock)) (goto-char (car clock)) (if org-clock-into-drawer - (ignore-errors - (outline-flag-region (save-excursion - (outline-back-to-heading t) - (search-forward ":LOGBOOK:") - (goto-char (match-beginning 0))) - (save-excursion - (outline-back-to-heading t) - (search-forward ":LOGBOOK:") - (search-forward ":END:") - (goto-char (match-end 0))) - nil))))) + (let ((logbook + (if (stringp org-clock-into-drawer) + (concat ":" org-clock-into-drawer ":") + ":LOGBOOK:"))) + (ignore-errors + (outline-flag-region + (save-excursion + (outline-back-to-heading t) + (search-forward logbook) + (goto-char (match-beginning 0))) + (save-excursion + (outline-back-to-heading t) + (search-forward logbook) + (search-forward ":END:") + (goto-char (match-end 0))) + nil)))))) (let (char-pressed) (while (null char-pressed) (setq char-pressed