diff options
| -rw-r--r-- | commands/msg/reply.go | 14 | ||||
| -rw-r--r-- | doc/aerc.1.scd | 7 |
2 files changed, 10 insertions, 11 deletions
diff --git a/commands/msg/reply.go b/commands/msg/reply.go index 2654514e..aeb186f8 100644 --- a/commands/msg/reply.go +++ b/commands/msg/reply.go @@ -212,11 +212,11 @@ func (r reply) Execute(args []string) error { return nil } - if r.Quote { - if r.Template == "" { - r.Template = config.Templates.QuotedReply - } + if r.Quote && r.Template == "" { + r.Template = config.Templates.QuotedReply + } + if r.Template != "" { var fetchBodyPart func([]int, func(io.Reader)) if isMsgViewer { @@ -229,7 +229,7 @@ func (r reply) Execute(args []string) error { if crypto.IsEncrypted(msg.BodyStructure) && !isMsgViewer { return fmt.Errorf("message is encrypted. " + - "can only quote reply from the message viewer") + "can only include reply from the message viewer") } part := getMessagePart(msg, widget) @@ -259,9 +259,7 @@ func (r reply) Execute(args []string) error { return nil } else { - if r.Template == "" { - r.Template = config.Templates.NewMessage - } + r.Template = config.Templates.NewMessage return addTab() } } diff --git a/doc/aerc.1.scd b/doc/aerc.1.scd index 66888374..6b48bc3e 100644 --- a/doc/aerc.1.scd +++ b/doc/aerc.1.scd @@ -460,12 +460,13 @@ message list, the message in the message viewer, etc). *-c*: Close the view tab when replying. If the reply is not sent, reopen the view tab. - *-q*: Insert a quoted version of the selected message into the reply editor + *-q*: Insert a quoted version of the selected message into the reply + editor. This defaults to what is set as *quoted-reply* in the *[templates]* + section of _aerc.conf_. *-T* _<template-file>_ Use the specified template file for creating the initial - message body. If *-q* is specified, defaults to what is set as - *quoted-reply* in the *[templates]* section of _aerc.conf_. + message body. *-A*_: _<account>_ Reply with the specified account instead of the current one. |