Llewellyn/fzf
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/fzf.git synced 2024-11-22 04:45:14 +00:00
Code Issues Projects Releases Wiki Activity

Empty --marker-multi-line if --marker is empty

Browse Source
This commit is contained in:
Junegunn Choi 2024-06-25 20:49:42 +09:00
parent 3b944addd4
commit 0420ed4f2a
No known key found for this signature in database
GPG Key ID: 254BC280FEF9C627
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -23,11 +23,7 @@ CHANGELOG
- Pointer and marker signs can be set to empty strings - Pointer and marker signs can be set to empty strings
```sh ```sh
# Minimal style # Minimal style
fzf --pointer '' --marker '' --info hidden fzf --pointer '' --marker '' --prompt '' --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
``` ```
- Better cache management and improved rendering for `--tail` - Better cache management and improved rendering for `--tail`
- Improved `--sync` behavior - Improved `--sync` behavior

5
src/options.go
View File

@ -2788,10 +2788,9 @@ func postProcessOptions(opts *Options) error {
opts.Pointer = &defaultPointer opts.Pointer = &defaultPointer
} }
multiLine := opts.MultiLine && opts.ReadZero
markerLen := 1 markerLen := 1
if opts.Marker == nil { if opts.Marker == nil {
if multiLine && opts.MarkerMulti != nil && opts.MarkerMulti[0] == "" { if opts.MarkerMulti != nil && opts.MarkerMulti[0] == "" {
empty := "" empty := ""
opts.Marker = &empty opts.Marker = &empty
markerLen = 0 markerLen = 0
@ -2809,7 +2808,7 @@ func postProcessOptions(opts *Options) error {
markerMultiLen := 1 markerMultiLen := 1
if opts.MarkerMulti == nil { if opts.MarkerMulti == nil {
if !multiLine && *opts.Marker == "" { if *opts.Marker == "" {
opts.MarkerMulti = &[3]string{} opts.MarkerMulti = &[3]string{}
markerMultiLen = 0 markerMultiLen = 0
} else if opts.Unicode { } else if opts.Unicode {