Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

Conflicts:
	lisp/ChangeLog
This commit is contained in:
Carsten Dominik 2008-09-26 18:28:45 +02:00
commit fcff45bc35
2 changed files with 6 additions and 1 deletions

View File

@ -4,6 +4,11 @@
functions, similar to the outline versions, but invisible headings
are OK.
2008-09-25 Bastien Guerry <bzg@altern.org>
* org.el (org-auto-repeat-maybe): Insert a space between
the timestamp's type and the timestamp itself.
2008-09-24 Carsten Dominik <dominik@science.uva.nl>
* org-table.el (org-table-sum): Do not format the result with %g,

View File

@ -8113,7 +8113,7 @@ This function is run automatically after each state change to a DONE state."
(setq ts (match-string 1))
(string-match "\\([.+]\\)?\\(\\+[0-9]+\\)\\([dwmy]\\)" ts))))
(org-timestamp-change n (cdr (assoc what whata)))
(setq msg (concat msg type org-last-changed-timestamp " "))))
(setq msg (concat msg type " " org-last-changed-timestamp " "))))
(setq org-log-post-message msg)
(message "%s" msg))))