1
0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-23 07:18:53 +00:00
Commit Graph

194 Commits

Author SHA1 Message Date
Carsten Dominik
08b81dbb1d Minor fix 2009-04-14 12:40:25 +02:00
Carsten Dominik
633e8cdd90 Clock: Fix bugs when resuming the clock.
Adam Elliot writes:

>  Automatically resuming the clock after an Emacs restart
>  fails under the following cases:
>
>  1. If org-log-states-order-reversed set to t (default), and
>     a state change line precedes the clock line to resume.
>     Error message is "Cannot restart clock because task does
>     not contain unfinished clock".
>
[...]
>  2. If org-log-states-order-reversed set to nil.  Error
>     message is the same.  Reason: point is placed *after*
>     last clock line and so fails looking-at test.
>

This commit fixes the problem, in a slightly different way
than Adam proposed.  Instead of trying to fix the old way to
find the position of the clock, we now simple search the
entry if there is an unfinished clock and go there.  Since
new clocks are added before older ones, this should be a
safe bet.
2009-04-14 09:50:05 +02:00
Carsten Dominik
ef2ee3df5d Version number pushed to 6.25trans 2009-04-07 18:43:42 +02:00
Carsten Dominik
eef47f820f Release 6.25d 2009-04-05 15:29:45 +02:00
Carsten Dominik
e2eebc83a1 Release 6.25c 2009-04-05 08:45:39 +02:00
Carsten Dominik
5624263d97 Release 6.25b 2009-04-03 19:18:41 +02:00
Carsten Dominik
1426f8bcfd Release 6.25a 2009-04-02 18:24:52 +02:00
Carsten Dominik
aeb5cb98d6 Release 6.25 2009-04-01 16:00:39 +02:00
Carsten Dominik
098cf35983 Clock: Clock out when done also in indirect buffers
Chris Randle writes:

>  I have one giant Org-mode file for everything. I frequently use
>  `C-c C-x b' to take the current node and show it in a new frame
>  with narrow subtree so that I can concentrate on just that region
>  of my file. Rather like hoist in GrandView, if anyone remembers
>  that.
>
>  My Org Manual (6.24b) says "The indirect buffer...will contain
>  the entire buffer, but will be narrowed to the current
>  tree. Editing the indirect buffer will also change the original
>  buffer, but without affecting visibility in that buffer.
>
>  I've noticed that, when working in the new frame, changing the
>  TODO state of any item within the frame to DONE (when it is the
>  currently clocked in item) does not stop the clock. Going back to
>  my main frame and doing the same thing there on the same item
>  does stop the clock.
>
>  I haven't altered `org-clock-out-when-done', and Emacs reports
>  its value as t.

This was caused by the fact that markers seem to point to the
base buffer always, so we need to check if the current buffer's
base buffer is equal to the marker buffer.
2009-03-23 21:02:23 +01:00
Carsten Dominik
76ac6dce68 Bugfix: Fix indentation problems
David Maus writes:

>  When I start to clock a headline (C-c C-x C-i) that does not have a
>  LOGBOOK drawer orgmode inserts one but removes the indentation of the
>  first line below the headline:
>
>  Example:
>
>  * TODO Do something
>   Do this, do that etc.
>
>  after C-c C-x C-i becomes
>
>  * TODO Do something
>   :LOGBOOK:
>   CLOCK: [2009-03-20 Fr 19:03]--[2009-03-20 Fr 19:03] =>  0:00
>   :END:
>  Do this, do that etc.

Fixed with this commit, a patch written by Peter Jones.
2009-03-21 18:24:51 +01:00
Carsten Dominik
722fc9a490 Version number to 6.24trans 2009-03-14 08:03:10 +01:00
Carsten Dominik
c8b6a9cc60 Release 6.24c 2009-03-12 12:51:17 +01:00
Carsten Dominik
680d8cb440 Release 6.24b 2009-03-10 17:50:17 +01:00
Carsten Dominik
7e8a387184 Release 6.24a 2009-03-09 05:37:09 +01:00
Carsten Dominik
20828f3176 Release 6.24 2009-03-05 21:11:18 +01:00
Carsten Dominik
0850b14c8f Clocktable: Use inactive time stamps for stepwise table
Adam Elliott writes:

>  When run in day-step mode, the clocktable header line for each day's
>  table contains an active timestamp.  I figure it should be an inactive
>  timestamp, since otherwise I get a junk entry in the agenda each day
>  (whatever heading was previous to the clocktable).
>
>  I'm talking about the output from a spec such as the following:
>
>  #+BEGIN: clocktable :block thisweek :step day

This commit is the patch Adam sent in.
2009-03-05 16:11:57 +01:00
Carsten Dominik
721dae7dd5 Bugfix: Better indentation for new clock/logbook drawers 2009-03-02 06:41:29 +01:00
Carsten Dominik
c91bca9d1c Push version number to 6.23trans 2009-02-26 21:32:04 +01:00
Carsten Dominik
6c8beec225 Release 6.23b 2009-02-22 18:37:24 +01:00
Carsten Dominik
482216f300 Release 6.23a 2009-02-21 15:18:39 +01:00
Carsten Dominik
82f2fca21e Release 6.23 2009-02-20 11:16:03 +01:00
Carsten Dominik
cac8788f35 Clocking: Capture clock in LOGBOOK drawer, abandon CLOCK drawer
Clock lines are now by default captured into the drawer LOGBOOK.  This
means that, if state notes are also captured into a drawer, they will
be mixed with notes.
2009-02-15 09:22:14 +01:00
Carsten Dominik
492a5b5ea9 Version number: Push to 6.22trans 2009-02-13 07:45:42 +01:00
Carsten Dominik
c32de18ae0 Allow previous state to be shown in state change log notes.
Wanrong Lin writes:

     My TODO sequence is set up as following:

     (setq org-todo-keywords '((sequence "TODO(t)" "STARTED(s!)"
     "WAITING(w@/!)"      "MAYBE(m/!)" "DELEGATED(g@/!)"
     "DEFERRED(d!/!)" "HOLD(h!/!)" "|" "DONE(x)"      "CANCELED(c)")))

     The state change logging is great, but I wonder whether we can
     further improve it:

     1. Can we also include the original state in the log message?
     i.e.: instead of having      - State "DEFERRED"   [2009-02-11 Wed 11:38]
     we can have
     - State "DEFERRED"  from "HOLD" [2009-02-11 Wed 11:38]

     The message will be clearer, and useful even when somebody edited
     the TODO keyword in place without using the "org-todo" command
     (in that case, simply looking at all the "destination states" in
     the log message does not give us the right information).

This strikes me like a good idea, so I have implemented it with this
commit.
2009-02-12 09:48:07 +01:00
Carsten Dominik
651d2e7a14 Bugfix: Allow org-clock-into-drawer to be 1. 2009-02-11 16:17:38 +01:00
Carsten Dominik
f993ecd67d Daniel Clemente writes:
Consider a file with 2 lines:

     ------------------
     **** heading

     ------------------

      Place the cursor at line 2 (where you can type). Then use C-c C-x C-i
      to start a clock.

      You have now 3 lines:

     ------------------
     **** heading
         CLOCK: [2009-02-07 sb 01:06]

     ------------------

      However, the cursor is still placed at line 2, like before. I think
      it would be more useful if it were moved to line 3 so that you can
      start writing right away, just as before.  This saves you the C-n
      needed to move again to a blank line.

This commit implements exactly this request.
2009-02-11 15:01:13 +01:00
Carsten Dominik
621bafc1b5 Clocking: Make insertion of the CLOCK drawer safer
Daniel Clemente noticed that the clock drawer, when it is created for
the second clock entry, will swallow a plain list item after it,
because it thinks it might be a clock note.

This commit makes this function check for indentation.  If the plain
list item is indented less than the last clock line, it will be
assumed that it does not belong to the clocking line, and the drawer
will not swallow the item.
2009-02-11 14:41:22 +01:00
Carsten Dominik
bc5b0056e7 Release 6.22b 2009-02-10 20:21:33 +01:00
Carsten Dominik
e592c77846 Release 6.22a 2009-02-10 10:11:23 +01:00
Carsten Dominik
8d213584ff Release 6.22 2009-02-10 08:23:35 +01:00
Carsten Dominik
93ec228f36 Push version number to 6.21trans 2009-02-03 00:06:22 +01:00
Carsten Dominik
0b424cb238 Release 6.21b 2009-02-02 21:42:20 +01:00
Carsten Dominik
2fa17ebf74 Release 6.21a 2009-02-02 14:23:54 +01:00
Carsten Dominik
193fab0788 Release 6.21 2009-02-02 12:18:44 +01:00
Carsten Dominik
c1296074f2 Release 6.20i 2009-02-01 00:16:43 +01:00
Carsten Dominik
924110aecc Release 6.20h 2009-01-30 18:31:37 +01:00
Carsten Dominik
f99b00f61c Release 6.20g 2009-01-30 09:20:41 +01:00
Carsten Dominik
bb3570eae9 Release 6.20f 2009-01-29 15:29:07 +01:00
Carsten Dominik
11fa49dd21 Release 6.20e 2009-01-29 14:13:30 +01:00
Carsten Dominik
317f08c69b Release 6.20d 2009-01-29 10:38:35 +01:00
Carsten Dominik
435ac059bf Release 6.20c 2009-01-28 14:35:50 +01:00
Carsten Dominik
bc19e4df69 Release 6.20b 2009-01-28 14:04:56 +01:00
Carsten Dominik
16f7c4f384 Release 6.20a 2009-01-28 12:28:54 +01:00
Carsten Dominik
b81f597de0 Release 6.20 2009-01-28 09:30:12 +01:00
Carsten Dominik
a89bbe5cab Clocktables: Fix display of ISO week.
David Bremner writes:

    I have a clocktable that begins like this.

    #+BEGIN: clocktable :maxlevel 2 :block 2009-W05 :scope agenda-with-archives
    Clock summary at [2009-01-27 Tue 17:15], for week 2009-W04.

    [contents snipped]

    #+END:

    Whatever week I put in :block, it puts one less in the title.  It
    seems actually gather the clock data from the right week, but the
    title is wrong?  Or I misunderstand something as usual :-).

There was a problem wit the week starting date.
2009-01-28 09:24:51 +01:00
Carsten Dominik
78b4ca8cfc Release 6.19e 2009-01-27 11:44:49 +01:00
Carsten Dominik
2860252c9e Minor fixes, and release 6.19d 2009-01-27 09:11:34 +01:00
Carsten Dominik
c848dae4be Release 6.19c 2009-01-27 09:02:13 +01:00
Carsten Dominik
f31255c8f3 Maintenance: Remove unused variables. 2009-01-26 11:04:45 +01:00
Carsten Dominik
ea446a6ff7 Release 6.19b 2009-01-26 08:22:14 +01:00