summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2012-05-26 06:22:51 +0200
committerBastien Guerry <bzg@altern.org>2012-05-26 06:22:51 +0200
commit2a7321f70aa818b2c968b5b4ff14f7ec1a8851c6 (patch)
tree83dbed77bc3288188b695c029d4a2251f40e4647
parent0103d17a607670a1501d817240c749d9b525c4e0 (diff)
downloadorg-mode-2a7321f70aa818b2c968b5b4ff14f7ec1a8851c6.tar.gz
Revert "Let org-agenda-time-grid control if the grid is displayed"
This reverts commit 993dd076fbe1dc62f2297a24a3f6acd8890e1af0.
-rw-r--r--lisp/org-agenda.el7
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index eebb66f..cfd3e25 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -3886,11 +3886,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
- (append rtnall
- (org-agenda-add-time-grid-maybe rtnall ndays todayp)))
(if rtnall (insert ;; all entries
- (org-finalize-agenda-entries rtnall)
+ (org-finalize-agenda-entries
+ (org-agenda-add-time-grid-maybe
+ rtnall ndays todayp))
"\n"))
(put-text-property s (1- (point)) 'day d)
(put-text-property s (1- (point)) 'org-day-cnt day-cnt))))