Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2016-01-12 00:27:57 +01:00
commit b78a9badcd
1 changed files with 2 additions and 0 deletions

View File

@ -2627,12 +2627,14 @@ from the dynamic block definition."
((eq formula '%)
;; compute the column where the % numbers need to go
(setq pcol (+ 2
(length properties)
(if multifile 1 0)
(if level-p 1 0)
(if timestamp 1 0)
(min maxlevel (or ntcol 100))))
;; compute the column where the total time is
(setq tcol (+ 2
(length properties)
(if multifile 1 0)
(if level-p 1 0)
(if timestamp 1 0)))