ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
parent b1e7ec5010 0e0f5bba8c
commit fcff45bc35
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -4,6 +4,11 @@
functions, similar to the outline versions, but invisible headings functions, similar to the outline versions, but invisible headings
are OK. 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> 2008-09-24 Carsten Dominik <dominik@science.uva.nl>
* org-table.el (org-table-sum): Do not format the result with %g, * org-table.el (org-table-sum): Do not format the result with %g,

2
lisp/org.el
View File

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