compose: only add delimiter when a signature is defined

Inserting a solitary "-- " delimiter without any signature after it
makes no sense. Skip the whole delimiter check if the signature is
empty. Trim leading and trailing white space along the way.

Fixes: a553b33ebcbd ("compose: ensure signature uses standard delimiter")
Reported-by: Ben Cohen <ben@bencohen.net>
Signed-off-by: Robin Jarry <robin@jarry.cc>
Tested-by: Ben Cohen <ben@bencohen.net>

1 files changed, 4 insertions, 0 deletions

diff --git a/widgets/compose.go b/widgets/compose.go
index b74e1537..dc4719a6 100644
--- a/widgets/compose.go
+++ b/widgets/compose.go
@@ -542,6 +542,10 @@ func (c *Composer) AddSignature() {
 	} else {
 		signature = c.readSignatureFromFile()
 	}
+	signature = bytes.TrimSpace(signature)
+	if len(signature) == 0 {
+		return
+	}
 	signature = ensureSignatureDelimiter(signature)
 	c.AppendContents(bytes.NewReader(signature))
 }