blacklight/aerc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

template: remove last \n to fix additional new lines after quote

Browse source
This commit is contained in:
Leszek Cimała 2020-01-08 21:44:17 +01:00 committed by Drew DeVault
parent d238272bdb
commit fe9ec67eca
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/templates/template.go
View file

@ -97,6 +97,7 @@ func wrapLine(text string, lineWidth int) string {
func wrapText(text string, lineWidth int) string { func wrapText(text string, lineWidth int) string {
text = strings.ReplaceAll(text, "\r\n", "\n") text = strings.ReplaceAll(text, "\r\n", "\n")
text = strings.TrimRight(text, "\n")
lines := strings.Split(text, "\n") lines := strings.Split(text, "\n")
var wrapped strings.Builder var wrapped strings.Builder
@ -118,6 +119,7 @@ func wrapText(text string, lineWidth int) string {
// quote prepends "> " in front of every line in text // quote prepends "> " in front of every line in text
func quote(text string) string { func quote(text string) string {
text = strings.ReplaceAll(text, "\r\n", "\n") text = strings.ReplaceAll(text, "\r\n", "\n")
text = strings.TrimRight(text, "\n")
lines := strings.Split(text, "\n") lines := strings.Split(text, "\n")
var quoted strings.Builder var quoted strings.Builder
for _, line := range lines { for _, line := range lines {