summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2014-10-07 12:29:35 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2014-10-07 12:29:35 +0200
commit06944507f134d9b9e5bdf104059d49b435132a57 (patch)
treea1fbb85cdac1aa3bad8c8c29c568a5cc5fc801c3
parent942eb607e6d2c1d37a124fba2e41ea4cb57f6dd7 (diff)
parentd5c531725aa9a16d65b5345d39eb861f00acd02f (diff)
downloadorg-mode-06944507f134d9b9e5bdf104059d49b435132a57.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-agenda.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 1bec8dc..da7993c 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -1470,6 +1470,7 @@ symbols specifying conditions when the grid should be displayed:
weekly if the agenda shows an entire week
today show grid on current date, independent of daily/weekly display
require-timed show grid only if at least one item has a time specification
+ remove-match skip grid times already present in an entry
The second item is a string which will be placed behind the grid time.