diff options
author | Christophe Junke <junke.christophe@gmail.com> | 2012-07-29 09:56:06 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2012-08-07 23:44:08 +0200 |
commit | 9dae6f04b12c8e38c8dcfc71e3a1a2ce6e63bf99 (patch) | |
tree | ec42af79ec9c3c093981457cad846ced45d9b28b | |
parent | 179f5e484a9ab3e09fcaf28f5f17969848b285b1 (diff) | |
download | org-mode-9dae6f04b12c8e38c8dcfc71e3a1a2ce6e63bf99.tar.gz |
Let `org-agenda-time-grid' control if the grid is displayed.
* org-agenda.el (org-agenda-list): Ensure that the
list returned by `org-agenda-add-time-grid-maybe' is appended
to `rtnall' before checking if the latter is emtpy.
In the case where rtnall is empty (no item for current day), we do not
call org-agenda-add-time-grid-maybe. This seems bogus because that
function is already computing whether the time grid must be included,
and does so according to the user's preferences.
In particular, the `org-agenda-time-grid' variable has a
'require-timed' parameter controlling the visibility of the time grid.
So, this patch :
- removes the premature check for rtnall being empty,
- inconditionally calls org-agenda-add-time-grid-maybe,
- and finally checks the emptiness of the resulting list
before pretty printing.
TINYCHANGE
-rw-r--r-- | lisp/org-agenda.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index bffe657..a70e968 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -3895,10 +3895,10 @@ given in `org-agenda-start-on-weekday'." (put-text-property s (1- (point)) 'org-day-cnt day-cnt) (when todayp (put-text-property s (1- (point)) 'org-today t)) + (setq rtnall + (org-agenda-add-time-grid-maybe rtnall ndays todayp)) (if rtnall (insert ;; all entries - (org-finalize-agenda-entries - (org-agenda-add-time-grid-maybe - rtnall ndays todayp)) + (org-finalize-agenda-entries rtnall) "\n")) (put-text-property s (1- (point)) 'day d) (put-text-property s (1- (point)) 'org-day-cnt day-cnt)))) |