From: Alex Branham <branham@utexas.edu>
To: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Cc: emacs-orgmode@gnu.org
Subject: Re: [PATCH] allow users to customize string in org-agenda-time-grid
Date: Fri, 07 Jul 2017 10:34:24 +0200 [thread overview]
Message-ID: <87a84gir1r.fsf@utexas.edu> (raw)
In-Reply-To: <87shi866so.fsf@nicolasgoaziou.fr>
[-- Attachment #1: Type: text/plain, Size: 3587 bytes --]
Hi -
On Fri 07 Jul 2017 at 07:32, Nicolas Goaziou <mail@nicolasgoaziou.fr> wrote:
> Would it be better to extend `org-agenda-time-grid' instead? It could,
> e.g., support a fourth element in the list.
Sure, that's possible. Patch attached. Note that this way, users who have set org-agenda-time-grid to a list with three elements will see a slightly different agenda now (the default "......" will get dropped). The order of the items in the list is also a bit weird --- they get displayed in the order 3, 4, 2. I've updated the docstring to try to make this a bit clearer.
Alex
From 12e5561b1df1d86a45e7c418dd7dd44763e52423 Mon Sep 17 00:00:00 2001
From: Alex Branham <branham@utexas.edu>
Date: Fri, 7 Jul 2017 10:29:28 +0200
Subject: [PATCH] org-agenda.el: Allow users to customize string after
time-grid
* org-agenda.el: Users may now customize the string to display after
the time in the agenda by using the fourth element of org-agenda-time-grid.
TINYCHANGE
---
lisp/org-agenda.el | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index ddd1b7d11..d479a7f61 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -1480,7 +1480,8 @@ the variable `org-agenda-time-grid'."
(defcustom org-agenda-time-grid
'((daily today require-timed)
"----------------"
- (800 1000 1200 1400 1600 1800 2000))
+ (800 1000 1200 1400 1600 1800 2000)
+ "......")
"The settings for time grid for agenda display.
This is a list of three items. The first item is again a list. It contains
@@ -1492,10 +1493,12 @@ symbols specifying conditions when the grid should be displayed:
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.
+The second item is a string which will be placed where agenda items are displayed.
The third item is a list of integers, indicating the times that should have
-a grid line."
+a grid line.
+
+The fourth item is a string placed after the grid times and before agenda items."
:group 'org-agenda-time-grid
:type
'(list
@@ -1507,8 +1510,9 @@ a grid line."
require-timed)
(const :tag "Skip grid times already present in an entry"
remove-match))
- (string :tag "Grid String")
- (repeat :tag "Grid Times" (integer :tag "Time"))))
+ (string :tag "Grid String (after)")
+ (repeat :tag "Grid Times" (integer :tag "Time"))
+ (string :tag "Grid String (before)")))
(defcustom org-agenda-show-current-time-in-grid t
"Non-nil means show the current time in the time grid."
@@ -6400,6 +6404,7 @@ Any match of REMOVE-RE will be removed from TXT."
(get-text-property 1 'effort txt)))
;; time, tag, effort are needed for the eval of the prefix format
(tag (if tags (nth (1- (length tags)) tags) ""))
+ (time-grid-trailing-characters (nth 3 org-agenda-time-grid))
time
(ts (if dotime (concat
(if (stringp dotime) dotime "")
@@ -6478,8 +6483,8 @@ Any match of REMOVE-RE will be removed from TXT."
(s1 (concat
(org-agenda-time-of-day-to-ampm-maybe s1)
(if org-agenda-timegrid-use-ampm
- "........ "
- "......")))
+ (concat time-grid-trailing-characters " ")
+ time-grid-trailing-characters)))
(t ""))
extra (or (and (not habitp) extra) "")
category (if (symbolp category) (symbol-name category) category)
--
2.13.2
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-org-agenda.el-Allow-users-to-customize-string-after-.patch --]
[-- Type: text/x-diff, Size: 3007 bytes --]
From 12e5561b1df1d86a45e7c418dd7dd44763e52423 Mon Sep 17 00:00:00 2001
From: Alex Branham <branham@utexas.edu>
Date: Fri, 7 Jul 2017 10:29:28 +0200
Subject: [PATCH] org-agenda.el: Allow users to customize string after
time-grid
* org-agenda.el: Users may now customize the string to display after
the time in the agenda by using the fourth element of org-agenda-time-grid.
TINYCHANGE
---
lisp/org-agenda.el | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index ddd1b7d11..d479a7f61 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -1480,7 +1480,8 @@ the variable `org-agenda-time-grid'."
(defcustom org-agenda-time-grid
'((daily today require-timed)
"----------------"
- (800 1000 1200 1400 1600 1800 2000))
+ (800 1000 1200 1400 1600 1800 2000)
+ "......")
"The settings for time grid for agenda display.
This is a list of three items. The first item is again a list. It contains
@@ -1492,10 +1493,12 @@ symbols specifying conditions when the grid should be displayed:
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.
+The second item is a string which will be placed where agenda items are displayed.
The third item is a list of integers, indicating the times that should have
-a grid line."
+a grid line.
+
+The fourth item is a string placed after the grid times and before agenda items."
:group 'org-agenda-time-grid
:type
'(list
@@ -1507,8 +1510,9 @@ a grid line."
require-timed)
(const :tag "Skip grid times already present in an entry"
remove-match))
- (string :tag "Grid String")
- (repeat :tag "Grid Times" (integer :tag "Time"))))
+ (string :tag "Grid String (after)")
+ (repeat :tag "Grid Times" (integer :tag "Time"))
+ (string :tag "Grid String (before)")))
(defcustom org-agenda-show-current-time-in-grid t
"Non-nil means show the current time in the time grid."
@@ -6400,6 +6404,7 @@ Any match of REMOVE-RE will be removed from TXT."
(get-text-property 1 'effort txt)))
;; time, tag, effort are needed for the eval of the prefix format
(tag (if tags (nth (1- (length tags)) tags) ""))
+ (time-grid-trailing-characters (nth 3 org-agenda-time-grid))
time
(ts (if dotime (concat
(if (stringp dotime) dotime "")
@@ -6478,8 +6483,8 @@ Any match of REMOVE-RE will be removed from TXT."
(s1 (concat
(org-agenda-time-of-day-to-ampm-maybe s1)
(if org-agenda-timegrid-use-ampm
- "........ "
- "......")))
+ (concat time-grid-trailing-characters " ")
+ time-grid-trailing-characters)))
(t ""))
extra (or (and (not habitp) extra) "")
category (if (symbolp category) (symbol-name category) category)
--
2.13.2
next prev parent reply other threads:[~2017-07-07 8:34 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-07 6:37 [PATCH] allow users to customize string in org-agenda-time-grid Alex Branham
2017-07-07 7:32 ` Nicolas Goaziou
2017-07-07 8:34 ` Alex Branham [this message]
2017-07-10 13:39 ` Nicolas Goaziou
2017-07-11 6:21 ` Alex Branham
2017-07-11 8:05 ` Nicolas Goaziou
2017-07-10 20:02 ` Samuel Wales
2017-07-11 6:16 ` Alex Branham
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87a84gir1r.fsf@utexas.edu \
--to=branham@utexas.edu \
--cc=emacs-orgmode@gnu.org \
--cc=mail@nicolasgoaziou.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).