all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [PATCH] Avoid losing persisted clock data when exiting emac without loading org-mode
@ 2009-10-23  7:01 Kai Tetzlaff
  2009-10-24 16:48 ` Carsten Dominik
  0 siblings, 1 reply; 5+ messages in thread
From: Kai Tetzlaff @ 2009-10-23  7:01 UTC (permalink / raw)
  To: emacs-orgmode

[-- Attachment #1: Type: text/plain, Size: 1756 bytes --]

Hi,

i noticed that when using the org-mode clock persistence, the stored
clock data gets deleted when i start emacs and exit again without
turning on org-mode in between.

When looking at org-clock-persistence-insinuate it looks like org-clock
load will only run after org-mode gets started whereas org-clock-save
will always be called when exiting emacs:

(defun org-clock-persistence-insinuate ()
  "Set up hooks for clock persistence"
  (add-hook 'org-mode-hook 'org-clock-load)
  (add-hook 'kill-emacs-hook 'org-clock-save))

Not running org-mode-hook (i.e. not starting org-mode) thus does not
load clock data but org-clock-save overwrites any prviously saved data
when exiting emacs.

An easy fix for that would be to just add org-clock-load to e.g.
emacs-startup-hook. But this will only work if the code in
org-clock-load does not depend on any org-mode initialization code (or
would require loading org-mode).

So org-clock-save should probably check if org-clock-load has been
running during the current emacs session (or if clock persistence was
just enabled) and only then save clock data when exiting emacs. I tried
to add this to the code in org-clock-save:

diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index c7ebbf8..c0fe4e6 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -1803,7 +1803,8 @@ This function is made for clock tables."
   "Persist various clock-related data to disk.
 The details of what will be saved are regulated by the variable
 `org-clock-persist'."
-  (when org-clock-persist
+  (when (and org-clock-persist
+             (or org-clock-loaded (not (file-exists-p
org-clock-persist-file))))
     (let (b)
       (with-current-buffer (find-file (expand-file-name
org-clock-persist-file))
 	(progn


/Kai


[-- Attachment #2: clock-save.patch --]
[-- Type: text/plain, Size: 574 bytes --]

diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index c7ebbf8..c0fe4e6 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -1803,7 +1803,8 @@ This function is made for clock tables."
   "Persist various clock-related data to disk.
 The details of what will be saved are regulated by the variable
 `org-clock-persist'."
-  (when org-clock-persist
+  (when (and org-clock-persist
+             (or org-clock-loaded (not (file-exists-p org-clock-persist-file))))
     (let (b)
       (with-current-buffer (find-file (expand-file-name org-clock-persist-file))
 	(progn

[-- Attachment #3: Type: text/plain, Size: 204 bytes --]

_______________________________________________
Emacs-orgmode mailing list
Remember: use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode

^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2009-10-25  8:11 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-23  7:01 [PATCH] Avoid losing persisted clock data when exiting emac without loading org-mode Kai Tetzlaff
2009-10-24 16:48 ` Carsten Dominik
2009-10-24 17:03   ` Kai Tetzlaff
2009-10-24 18:40   ` Kai Tetzlaff
2009-10-25  8:10     ` Carsten Dominik

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.