From c1cc420149b8fe8cbdeffbc2bb6cc55d0ceb2479 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Thu, 13 May 2010 07:45:26 +0200 Subject: [PATCH 1/2] Add help-echo to habit graph Patch by Michael Fornius. --- lisp/ChangeLog | 5 +++++ lisp/org-habit.el | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d7dc6386b..45c9ec79e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-05-13 Mikael Fornius + + * org-habit.el (org-habit-build-graph): Help-echo date when + mouse is over stars. + 2010-05-13 Jan Böker * org.el (org-file-apps): Improve docstring to reflect diff --git a/lisp/org-habit.el b/lisp/org-habit.el index 3d731cab6..098f24d21 100644 --- a/lisp/org-habit.el +++ b/lisp/org-habit.el @@ -280,9 +280,16 @@ current time." donep))) markedp face) (if donep - (progn + (let ((done-time (time-add + starting + (days-to-time + (- start (time-to-days starting)))))) + (aset graph index ?*) (setq markedp t) + (put-text-property + index (1+ index) 'help-echo + (format-time-string (org-time-stamp-format) done-time) graph) (while (and done-dates (= start (car done-dates))) (setq last-done-date (car done-dates) From a95427de186e60d81fc8d9e87a2171bebb0b0a74 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Thu, 13 May 2010 07:49:42 +0200 Subject: [PATCH 2/2] New %T escape for note headings Patch by Richard Riley. --- lisp/org.el | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lisp/org.el b/lisp/org.el index b1ff2c381..18fbc57f9 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -2143,6 +2143,7 @@ The value is an alist, with the car being a symbol indicating the note context, and the cdr is the heading to be used. The heading may also be the empty string. %t in the heading will be replaced by a time stamp. +%T will be an acive time stamp instead the default inacive one %s will be replaced by the new TODO state, in double quotes. %S will be replaced by the old TODO state, in double quotes. %u will be replaced by the user name. @@ -11377,6 +11378,9 @@ EXTRA is additional text that will be inserted into the notes buffer." (cons "%t" (format-time-string (org-time-stamp-format 'long 'inactive) (current-time))) + (cons "%T" (format-time-string + (org-time-stamp-format 'long nil) + (current-time))) (cons "%s" (if org-log-note-state (concat "\"" org-log-note-state "\"") ""))