Mercurial > emacs
changeset 96490:2bab01f9c7bb
* org.el (org-agenda-skip-unavailable-files):
* org-clock.el (org-clock-out-when-done): Doc fixes.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Wed, 02 Jul 2008 13:27:18 +0000 |
| parents | b76b9628d74f |
| children | c427b6f2332a |
| files | lisp/org/ChangeLog lisp/org/org-clock.el lisp/org/org.el |
| diffstat | 3 files changed, 17 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/org/ChangeLog Wed Jul 02 13:19:07 2008 +0000 +++ b/lisp/org/ChangeLog Wed Jul 02 13:27:18 2008 +0000 @@ -1,3 +1,8 @@ +2008-07-02 Juanma Barranquero <lekktu@gmail.com> + + * org.el (org-agenda-skip-unavailable-files): + * org-clock.el (org-clock-out-when-done): Doc fixes. + 2008-06-18 Glenn Morris <rgm@gnu.org> * org.el (org-map-entries): Let-bind `file'. @@ -21,7 +26,7 @@ (org-read-date): Respect `org-overriding-default-time'. * org-remember.el (org-remember-apply-template): Respect the - ovverriding default time. + overriding default time. * org-agenda.el (org-agenda-action-marker): New variable. (org-agenda-action): New command.
--- a/lisp/org/org-clock.el Wed Jul 02 13:19:07 2008 +0000 +++ b/lisp/org/org-clock.el Wed Jul 02 13:27:18 2008 +0000 @@ -55,7 +55,7 @@ (defcustom org-clock-out-when-done t "When t, the clock will be stopped when the relevant entry is marked DONE. -Nil means, clock will keep running until stopped explicitly with +When nil, clock will keep running until stopped explicitly with `C-c C-x C-o', or until the clock is started in a different item." :group 'org-clock :type 'boolean) @@ -136,7 +136,7 @@ "Select a task that recently was associated with clocking." (interactive) (let (sel-list rpl file task (i 0) s) - (save-window-excursion + (save-window-excursion (org-switch-to-buffer-other-window (get-buffer-create "*Clock Task Select*")) (erase-buffer) @@ -190,7 +190,7 @@ (when (and cat task) (insert (format "[%c] %-15s %s\n" i cat task)) (cons i marker))))) - + (defun org-update-mode-line () (let* ((delta (- (time-to-seconds (current-time)) (time-to-seconds org-clock-start-time))) @@ -226,13 +226,13 @@ (marker-position org-clock-marker) (marker-buffer org-clock-marker)) (org-clock-out t)) - + (when (equal select '(16)) ;; Mark as default clocking task (save-excursion (org-back-to-heading t) (move-marker org-clock-default-task (point)))) - + (setq target-pos (point)) ;; we want to clock in at this location (save-excursion (when (and selected-task (marker-buffer selected-task)) @@ -261,7 +261,7 @@ (setq org-clock-heading "???"))) (setq org-clock-heading (propertize org-clock-heading 'face nil)) (org-clock-find-position) - + (insert "\n") (backward-char 1) (indent-relative) (insert org-clock-string " ") @@ -735,9 +735,9 @@ (ins (make-marker)) (total-time nil) (scope (plist-get params :scope)) - (tostring (plist-get params :tostring)) - (multifile (plist-get params :multifile)) - (header (plist-get params :header)) + (tostring (plist-get params :tostring)) + (multifile (plist-get params :multifile)) + (header (plist-get params :header)) (maxlevel (or (plist-get params :maxlevel) 3)) (step (plist-get params :step)) (emph (plist-get params :emphasize))
--- a/lisp/org/org.el Wed Jul 02 13:19:07 2008 +0000 +++ b/lisp/org/org.el Wed Jul 02 13:27:18 2008 +0000 @@ -1987,8 +1987,8 @@ 'org-agenda-text-search-extra-files)) (defcustom org-agenda-skip-unavailable-files nil - "t means to just skip non-reachable files in `org-agenda-files'. -Nil means to remove them, after a query, from the list." + "Non-nil means to just skip non-reachable files in `org-agenda-files'. +A nil value means to remove them, after a query, from the list." :group 'org-agenda :type 'boolean)