From 0420ed4f2a7edcc7f91dc233665f914ce023b7b3 Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Tue, 25 Jun 2024 20:49:42 +0900 Subject: [PATCH] Empty --marker-multi-line if --marker is empty --- CHANGELOG.md | 6 +----- src/options.go | 5 ++--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c1d6327e9fd..31312ddd28d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,11 +23,7 @@ CHANGELOG - Pointer and marker signs can be set to empty strings ```sh # Minimal style - fzf --pointer '' --marker '' --info hidden - - # When --read0 is specified, there can be multi-line entries, - # so you need to set --marker-multi-line to an empty string - find . -print0 | fzf --read0 --pointer '' --marker-multi-line '' --info hidden + fzf --pointer '' --marker '' --prompt '' --info hidden ``` - Better cache management and improved rendering for `--tail` - Improved `--sync` behavior diff --git a/src/options.go b/src/options.go index 63550712800..d32daf10087 100644 --- a/src/options.go +++ b/src/options.go @@ -2788,10 +2788,9 @@ func postProcessOptions(opts *Options) error { opts.Pointer = &defaultPointer } - multiLine := opts.MultiLine && opts.ReadZero markerLen := 1 if opts.Marker == nil { - if multiLine && opts.MarkerMulti != nil && opts.MarkerMulti[0] == "" { + if opts.MarkerMulti != nil && opts.MarkerMulti[0] == "" { empty := "" opts.Marker = &empty markerLen = 0 @@ -2809,7 +2808,7 @@ func postProcessOptions(opts *Options) error { markerMultiLen := 1 if opts.MarkerMulti == nil { - if !multiLine && *opts.Marker == "" { + if *opts.Marker == "" { opts.MarkerMulti = &[3]string{} markerMultiLen = 0 } else if opts.Unicode {