.github/workflows/typos.yml

@@ -7,4 +7,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: crate-ci/typos@v1.28.4
+    - uses: crate-ci/typos@v1.28.2

Makefile

@@ -1,3 +1,4 @@
+SHELL          := bash
 GO             ?= go
 GOOS           ?= $(shell $(GO) env GOOS)
 
@@ -13,7 +14,7 @@ endif
 ifeq ($(VERSION),)
 $(error Not on git repository; cannot determine $$FZF_VERSION)
 endif
-VERSION_TRIM   := $(shell echo $(VERSION) | sed "s/^v//; s/-.*//")
+VERSION_TRIM   := $(shell sed "s/^v//; s/-.*//" <<< $(VERSION))
 VERSION_REGEX  := $(subst .,\.,$(VERSION_TRIM))
 
 ifdef FZF_REVISION

src/terminal.go

@@ -3181,28 +3181,17 @@ func (t *Terminal) printAll() {
 func (t *Terminal) flush() {
 	t.placeCursor()
 	if !t.suppress {
-		windows := make([]tui.Window, 0, 7)
-		if t.border != nil {
+		windows := make([]tui.Window, 0, 4)
+		if t.borderShape.Visible() {
 			windows = append(windows, t.border)
 		}
-		if t.pborder != nil {
-			windows = append(windows, t.pborder)
-		}
-		if t.pwindow != nil {
+		if t.hasPreviewWindow() {
+			if t.pborder != nil {
+				windows = append(windows, t.pborder)
+			}
 			windows = append(windows, t.pwindow)
 		}
-		if t.wborder != nil {
-			windows = append(windows, t.wborder)
-		}
-		if t.window != nil {
-			windows = append(windows, t.window)
-		}
-		if t.inputBorder != nil {
-			windows = append(windows, t.inputBorder)
-		}
-		if t.inputWindow != nil {
-			windows = append(windows, t.inputWindow)
-		}
+		windows = append(windows, t.window)
 		t.tui.RefreshWindows(windows)
 	}
 }