Fix scdoc & gofmt issues

This commit is contained in:
Drew DeVault 2019-05-18 15:34:16 -04:00
parent b8208509f4
commit ca2cd00fe7
8 changed files with 29 additions and 35 deletions

View File

@ -29,5 +29,3 @@ func Compose(aerc *widgets.Aerc, args []string) error {
})
return nil
}

View File

@ -8,11 +8,11 @@ import (
gomail "net/mail"
"strings"
"git.sr.ht/~sircmpwn/getopt"
"github.com/emersion/go-imap"
"github.com/emersion/go-message"
_ "github.com/emersion/go-message/charset"
"github.com/emersion/go-message/mail"
"github.com/emersion/go-imap"
"git.sr.ht/~sircmpwn/getopt"
"git.sr.ht/~sircmpwn/aerc/widgets"
)
@ -26,7 +26,7 @@ func Reply(aerc *widgets.Aerc, args []string) error {
if err != nil {
return err
}
if optind != len(args) - 1 {
if optind != len(args)-1 {
return errors.New("Usage: reply [-aq]")
}
var (
@ -103,9 +103,9 @@ func Reply(aerc *widgets.Aerc, args []string) error {
composer := widgets.NewComposer(
aerc.Config(), acct.AccountConfig(), acct.Worker()).
Defaults(map[string]string{
"To": strings.Join(to, ","),
"Cc": strings.Join(cc, ","),
"Subject": subject,
"To": strings.Join(to, ","),
"Cc": strings.Join(cc, ","),
"Subject": subject,
"In-Reply-To": msg.Envelope.MessageId,
}).
FocusTerminal()
@ -153,7 +153,7 @@ func Reply(aerc *widgets.Aerc, args []string) error {
msg.Envelope.Date.Format("Mon Jan 2, 2006 at 3:04 PM"),
msg.Envelope.From[0].PersonalName))
for scanner.Scan() {
io.WriteString(pipein, fmt.Sprintf("> %s\n",scanner.Text()))
io.WriteString(pipein, fmt.Sprintf("> %s\n", scanner.Text()))
}
pipein.Close()
pipeout.Close()
@ -165,5 +165,3 @@ func Reply(aerc *widgets.Aerc, args []string) error {
return nil
}

View File

@ -27,4 +27,3 @@ func ViewMessage(aerc *widgets.Aerc, args []string) error {
aerc.NewTab(viewer, msg.Envelope.Subject)
return nil
}

View File

@ -174,10 +174,10 @@ func SendMessage(aerc *widgets.Aerc, args []string) error {
r, w := io.Pipe()
worker.PostAction(&types.AppendMessage{
Destination: config.CopyTo,
Flags: []string{},
Date: time.Now(),
Reader: r,
Length: nbytes,
Flags: []string{},
Date: time.Now(),
Reader: r,
Length: nbytes,
}, func(msg types.WorkerMessage) {
switch msg := msg.(type) {
case *types.Done:

View File

@ -18,4 +18,3 @@ func CommandClose(aerc *widgets.Aerc, args []string) error {
aerc.RemoveTab(mv)
return nil
}

View File

@ -145,10 +145,10 @@ Note that many of these configuration options are written for you, such as
- *aerc-smtp*(5)
*outgoing_cred_cmd*
Specifies an optional command that is run to get the outgoing account's
password. See each protocol's man page for more details:
Specifies an optional command that is run to get the outgoing account's
password. See each protocol's man page for more details:
- *aerc-smtp*(5)
- *aerc-smtp*(5)
*source*
Specifies the source for reading incoming emails on this account. This key
@ -161,10 +161,10 @@ Note that many of these configuration options are written for you, such as
Default: none
*source_cred_cmd*
Specifies an optional command that is run to get the source account's
password. See each protocol's man page for more details:
Specifies an optional command that is run to get the source account's
password. See each protocol's man page for more details:
- *aerc-imap*(5)
- *aerc-imap*(5)
# BINDS.CONF

View File

@ -36,14 +36,14 @@ available:
IMAP with TLS/SSL
*source_cred_cmd*
Specifies the command to run to get the password for the IMAP
account. This command will be run using `sh -c [command]`. If a
password is specified in the *source* option, the password will
take precedence over this command.
Specifies the command to run to get the password for the IMAP
account. This command will be run using `sh -c [command]`. If a
password is specified in the *source* option, the password will
take precedence over this command.
Example:
Example:
`pass hostname/username`
pass hostname/username
# SEE ALSO

View File

@ -40,14 +40,14 @@ available:
default behavior.
*outgoing_cred_cmd*
Specifies the command to run to get the password for the SMTP
account. This command will be run using `sh -c [command]`. If a
password is specified in the *outgoing* option, the password will
take precedence over this command.
Specifies the command to run to get the password for the SMTP
account. This command will be run using `sh -c [command]`. If a
password is specified in the *outgoing* option, the password will
take precedence over this command.
Example:
Example:
`pass hostname/username`
pass hostname/username
# SEE ALSO