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

Merge commit 'james/bugfixes' 

Conflicts:
	lisp/ChangeLog
This commit is contained in:
Carsten Dominik 2009-11-25 13:24:47 +01:00
parent f759cc17a7 b0eaeaa0bd
commit f80694f89c
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/ChangeLog
View File

@ -7,6 +7,13 @@
* org-macs.el (org-re-search-forward-unprotected): New function. * org-macs.el (org-re-search-forward-unprotected): New function.
2009-11-25 James TD Smith <ahktenzero@mohorovi.cc>
* org-colview.el (org-agenda-colview-summarize): Sort out some
confusion between properties and titles, which resulted in
agenda summaries not working if a title was set for a column.
>>>>>>> james/bugfixes:lisp/ChangeLog
2009-11-24 Carsten Dominik <carsten.dominik@gmail.com> 2009-11-24 Carsten Dominik <carsten.dominik@gmail.com>
* org-mobile.el (org-mobile-agendas): New option. * org-mobile.el (org-mobile-agendas): New option.

12
lisp/org-colview.el
View File

@ -1377,8 +1377,9 @@ and tailing newline characters."
This will add overlays to the date lines, to show the summary for each day." This will add overlays to the date lines, to show the summary for each day."
(let* ((fmt (mapcar (lambda (x) (let* ((fmt (mapcar (lambda (x)
(if (equal (car x) "CLOCKSUM") (if (equal (car x) "CLOCKSUM")
(list "CLOCKSUM" (nth 2 x) nil 'add_times nil '+ 'identity) (list "CLOCKSUM" (nth 1 x) (nth 2 x) ":" 'add_times
(cdr x))) nil '+ nil)
x))
org-columns-current-fmt-compiled)) org-columns-current-fmt-compiled))
line c c1 stype calc sumfunc props lsum entries prop v) line c c1 stype calc sumfunc props lsum entries prop v)
(catch 'exit (catch 'exit
@ -1404,9 +1405,10 @@ This will add overlays to the date lines, to show the summary for each day."
(mapcar (mapcar
(lambda (f) (lambda (f)
(setq prop (car f) (setq prop (car f)
stype (nth 3 f) title (nth 1 f)
sumfunc (nth 5 f) stype (nth 4 f)
calc (or (nth 6 f) 'identity)) sumfunc (nth 6 f)
calc (or (nth 7 f) 'identity))
(cond (cond
((equal prop "ITEM") ((equal prop "ITEM")
(cons prop (buffer-substring (point-at-bol) (cons prop (buffer-substring (point-at-bol)