Skip to content

Commit

Permalink
Empty --marker-multi-line if --marker is empty
Browse files Browse the repository at this point in the history
  • Loading branch information
junegunn committed Jun 25, 2024
1 parent 3b944ad commit 0420ed4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
6 changes: 1 addition & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions src/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 {
Expand Down

0 comments on commit 0420ed4

Please sign in to comment.