diff options
| author | Juanma Barranquero | 2008-07-02 13:27:18 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2008-07-02 13:27:18 +0000 |
| commit | cf7241c896a4344dacc0fe70ee287d00a98d791a (patch) | |
| tree | 869cb3bf8acac92e37b53f6b67b456b479a04afd | |
| parent | 6cf29fe81529606336b0d1ac167af5a62b9843a3 (diff) | |
| download | emacs-cf7241c896a4344dacc0fe70ee287d00a98d791a.tar.gz emacs-cf7241c896a4344dacc0fe70ee287d00a98d791a.zip | |
* org.el (org-agenda-skip-unavailable-files):
* org-clock.el (org-clock-out-when-done): Doc fixes.
| -rw-r--r-- | lisp/org/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/org/org-clock.el | 18 | ||||
| -rw-r--r-- | lisp/org/org.el | 4 |
3 files changed, 17 insertions, 12 deletions
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 0f113854f2e..a7f3852404c 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-07-02 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * org.el (org-agenda-skip-unavailable-files): | ||
| 4 | * org-clock.el (org-clock-out-when-done): Doc fixes. | ||
| 5 | |||
| 1 | 2008-06-18 Glenn Morris <rgm@gnu.org> | 6 | 2008-06-18 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * org.el (org-map-entries): Let-bind `file'. | 8 | * org.el (org-map-entries): Let-bind `file'. |
| @@ -21,7 +26,7 @@ | |||
| 21 | (org-read-date): Respect `org-overriding-default-time'. | 26 | (org-read-date): Respect `org-overriding-default-time'. |
| 22 | 27 | ||
| 23 | * org-remember.el (org-remember-apply-template): Respect the | 28 | * org-remember.el (org-remember-apply-template): Respect the |
| 24 | ovverriding default time. | 29 | overriding default time. |
| 25 | 30 | ||
| 26 | * org-agenda.el (org-agenda-action-marker): New variable. | 31 | * org-agenda.el (org-agenda-action-marker): New variable. |
| 27 | (org-agenda-action): New command. | 32 | (org-agenda-action): New command. |
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el index 99be3907cd7..44d8840482a 100644 --- a/lisp/org/org-clock.el +++ b/lisp/org/org-clock.el | |||
| @@ -55,7 +55,7 @@ reaches or exceeds this number, a drawer will be created." | |||
| 55 | 55 | ||
| 56 | (defcustom org-clock-out-when-done t | 56 | (defcustom org-clock-out-when-done t |
| 57 | "When t, the clock will be stopped when the relevant entry is marked DONE. | 57 | "When t, the clock will be stopped when the relevant entry is marked DONE. |
| 58 | Nil means, clock will keep running until stopped explicitly with | 58 | When nil, clock will keep running until stopped explicitly with |
| 59 | `C-c C-x C-o', or until the clock is started in a different item." | 59 | `C-c C-x C-o', or until the clock is started in a different item." |
| 60 | :group 'org-clock | 60 | :group 'org-clock |
| 61 | :type 'boolean) | 61 | :type 'boolean) |
| @@ -136,7 +136,7 @@ of a different task.") | |||
| 136 | "Select a task that recently was associated with clocking." | 136 | "Select a task that recently was associated with clocking." |
| 137 | (interactive) | 137 | (interactive) |
| 138 | (let (sel-list rpl file task (i 0) s) | 138 | (let (sel-list rpl file task (i 0) s) |
| 139 | (save-window-excursion | 139 | (save-window-excursion |
| 140 | (org-switch-to-buffer-other-window | 140 | (org-switch-to-buffer-other-window |
| 141 | (get-buffer-create "*Clock Task Select*")) | 141 | (get-buffer-create "*Clock Task Select*")) |
| 142 | (erase-buffer) | 142 | (erase-buffer) |
| @@ -190,7 +190,7 @@ of a different task.") | |||
| 190 | (when (and cat task) | 190 | (when (and cat task) |
| 191 | (insert (format "[%c] %-15s %s\n" i cat task)) | 191 | (insert (format "[%c] %-15s %s\n" i cat task)) |
| 192 | (cons i marker))))) | 192 | (cons i marker))))) |
| 193 | 193 | ||
| 194 | (defun org-update-mode-line () | 194 | (defun org-update-mode-line () |
| 195 | (let* ((delta (- (time-to-seconds (current-time)) | 195 | (let* ((delta (- (time-to-seconds (current-time)) |
| 196 | (time-to-seconds org-clock-start-time))) | 196 | (time-to-seconds org-clock-start-time))) |
| @@ -226,13 +226,13 @@ the clocking selection, associated with the letter `d'." | |||
| 226 | (marker-position org-clock-marker) | 226 | (marker-position org-clock-marker) |
| 227 | (marker-buffer org-clock-marker)) | 227 | (marker-buffer org-clock-marker)) |
| 228 | (org-clock-out t)) | 228 | (org-clock-out t)) |
| 229 | 229 | ||
| 230 | (when (equal select '(16)) | 230 | (when (equal select '(16)) |
| 231 | ;; Mark as default clocking task | 231 | ;; Mark as default clocking task |
| 232 | (save-excursion | 232 | (save-excursion |
| 233 | (org-back-to-heading t) | 233 | (org-back-to-heading t) |
| 234 | (move-marker org-clock-default-task (point)))) | 234 | (move-marker org-clock-default-task (point)))) |
| 235 | 235 | ||
| 236 | (setq target-pos (point)) ;; we want to clock in at this location | 236 | (setq target-pos (point)) ;; we want to clock in at this location |
| 237 | (save-excursion | 237 | (save-excursion |
| 238 | (when (and selected-task (marker-buffer selected-task)) | 238 | (when (and selected-task (marker-buffer selected-task)) |
| @@ -261,7 +261,7 @@ the clocking selection, associated with the letter `d'." | |||
| 261 | (setq org-clock-heading "???"))) | 261 | (setq org-clock-heading "???"))) |
| 262 | (setq org-clock-heading (propertize org-clock-heading 'face nil)) | 262 | (setq org-clock-heading (propertize org-clock-heading 'face nil)) |
| 263 | (org-clock-find-position) | 263 | (org-clock-find-position) |
| 264 | 264 | ||
| 265 | (insert "\n") (backward-char 1) | 265 | (insert "\n") (backward-char 1) |
| 266 | (indent-relative) | 266 | (indent-relative) |
| 267 | (insert org-clock-string " ") | 267 | (insert org-clock-string " ") |
| @@ -735,9 +735,9 @@ the currently selected interval size." | |||
| 735 | (ins (make-marker)) | 735 | (ins (make-marker)) |
| 736 | (total-time nil) | 736 | (total-time nil) |
| 737 | (scope (plist-get params :scope)) | 737 | (scope (plist-get params :scope)) |
| 738 | (tostring (plist-get params :tostring)) | 738 | (tostring (plist-get params :tostring)) |
| 739 | (multifile (plist-get params :multifile)) | 739 | (multifile (plist-get params :multifile)) |
| 740 | (header (plist-get params :header)) | 740 | (header (plist-get params :header)) |
| 741 | (maxlevel (or (plist-get params :maxlevel) 3)) | 741 | (maxlevel (or (plist-get params :maxlevel) 3)) |
| 742 | (step (plist-get params :step)) | 742 | (step (plist-get params :step)) |
| 743 | (emph (plist-get params :emphasize)) | 743 | (emph (plist-get params :emphasize)) |
diff --git a/lisp/org/org.el b/lisp/org/org.el index 7a63ad74cfb..3186185259e 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el | |||
| @@ -1987,8 +1987,8 @@ scope." | |||
| 1987 | 'org-agenda-text-search-extra-files)) | 1987 | 'org-agenda-text-search-extra-files)) |
| 1988 | 1988 | ||
| 1989 | (defcustom org-agenda-skip-unavailable-files nil | 1989 | (defcustom org-agenda-skip-unavailable-files nil |
| 1990 | "t means to just skip non-reachable files in `org-agenda-files'. | 1990 | "Non-nil means to just skip non-reachable files in `org-agenda-files'. |
| 1991 | Nil means to remove them, after a query, from the list." | 1991 | A nil value means to remove them, after a query, from the list." |
| 1992 | :group 'org-agenda | 1992 | :group 'org-agenda |
| 1993 | :type 'boolean) | 1993 | :type 'boolean) |
| 1994 | 1994 | ||