~sircmpwn/aerc

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
1

[PATCH] Fix handling of multiple template-dirs

Details
Message ID
<20200123171840.71840-1-ben@benburwell.com>
DKIM signature
missing
Download raw message
Patch: +6 -4
Before, while the docs stated that template-dirs was a colon-separated
list, a delimiter was not specified in the struct tag, so it was falling
back to the default for the ini library (a comma). Also added a note to
the docs to clarify that templates are configured in the [templates]
section.
---
 config/config.go      | 6 +++---
 doc/aerc-config.5.scd | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/config/config.go b/config/config.go
index e5f7395..fe548ff 100644
--- a/config/config.go
+++ b/config/config.go
@@ -106,9 +106,9 @@ type TriggersConfig struct {
}

type TemplateConfig struct {
	TemplateDirs []string
	QuotedReply  string `ini:"quoted-reply"`
	Forwards     string `ini:"forwards"`
	TemplateDirs []string `ini:"template-dirs", delim:":"`
	QuotedReply  string   `ini:"quoted-reply"`
	Forwards     string   `ini:"forwards"`
}

type AercConfig struct {
diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd
index 5dac4ac..791a39d 100644
--- a/doc/aerc-config.5.scd
+++ b/doc/aerc-config.5.scd
@@ -269,7 +269,7 @@ They are configured in the *[triggers]* section of aerc.conf.
	Format specifiers from *index-format* are expanded with respect to the new
	message.

## Templates
## TEMPLATES

Templates are used to populate the body of an email. The compose, reply
and forward commands can be called with the -T flag with the name of the
@@ -278,6 +278,8 @@ template name.
aerc ships with some default templates installed in the share directory (usually
_/usr/share/aerc/templates_).

These options are configured in the *[templates]* section of aerc.conf.

*template-dirs*
	The directory where the templates are stored. The config takes a
	colon-separated list of dirs.
-- 
2.25.0
Details
Message ID
<20200124111809.tuzfjgxj5rmcvpnt@feather.localdomain>
In-Reply-To
<20200123171840.71840-1-ben@benburwell.com> (view parent)
DKIM signature
missing
Download raw message
Thanks Ben, merged.
Reply to thread Export thread (mbox)