mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge remote-tracking branch 'origin/maint' into maint

This commit is contained in:
Kyle Meyer 2016-01-12 02:22:47 -05:00
parent ba5e1be148 47c92146a9
commit 32ccc854cf
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/org-agenda.el
View File

@ -7705,7 +7705,7 @@ tags in the FILTER if any of the tags in FILTER are grouptags."
(progn (progn
(setq tags (org-get-at-bol 'tags) (setq tags (org-get-at-bol 'tags)
cat (org-get-at-eol 'org-category 1) cat (org-get-at-eol 'org-category 1)
txt (org-get-at-eol 'txt 1)) txt (org-get-at-bol 'txt))
(if (not (eval org-agenda-filter-form)) (if (not (eval org-agenda-filter-form))
(org-agenda-filter-hide-line type)) (org-agenda-filter-hide-line type))
(beginning-of-line 2)) (beginning-of-line 2))

2
lisp/org-clock.el
View File

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