diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2016-01-12 02:22:47 -0500 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2016-01-12 02:22:47 -0500 |
| commit | 32ccc854cf1c1fabd7c67959f920527627763dad (patch) | |
| tree | ce4fd303f5d281c52208480abac24a9150b79385 | |
| parent | ba5e1be14864d44b09bafecd1382c4cb797d21d4 (diff) | |
| parent | 47c92146a9694bc187f4caae02e7bd658ce8aebf (diff) | |
| download | org-mode-32ccc854cf1c1fabd7c67959f920527627763dad.tar.gz | |
Merge remote-tracking branch 'origin/maint' into maint
| -rw-r--r-- | lisp/org-agenda.el | 2 | ||||
| -rw-r--r-- | lisp/org-clock.el | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 59d0994..48d3804 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -7705,7 +7705,7 @@ tags in the FILTER if any of the tags in FILTER are grouptags." (progn (setq tags (org-get-at-bol 'tags) 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)) (org-agenda-filter-hide-line type)) (beginning-of-line 2)) diff --git a/lisp/org-clock.el b/lisp/org-clock.el index e6ca466..8e1fca0 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -2646,12 +2646,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))) |