mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-27 06:32:53 +00:00
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
This commit is contained in:
commit
83d10a541d
|
@ -1,3 +1,8 @@
|
|||
2010-05-13 Mikael Fornius <mfo@abc.se>
|
||||
|
||||
* org-habit.el (org-habit-build-graph): Help-echo date when
|
||||
mouse is over stars.
|
||||
|
||||
2010-05-13 Jan Böker <jan.boecker@jboecker.de>
|
||||
|
||||
* org.el (org-file-apps): Improve docstring to reflect
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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 "\"")
|
||||
""))
|
||||
|
|
Loading…
Reference in a new issue