mirror of
https://github.com/Llewellynvdm/fzf.git
synced 2024-11-21 20:35:11 +00:00
Empty --marker-multi-line if --marker is empty
This commit is contained in:
parent
3b944addd4
commit
0420ed4f2a
@ -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
|
||||
|
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user