From 8dc1377efb140c40c7e121b29d9cedb52ad9ea9f Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Fri, 22 Feb 2019 14:33:29 +0900 Subject: Export FZF_PREVIEW_LINES and FZF_PREVIEW_COLUMNS to preview process fzf will still override LINES and COLUMNS as before but they may not hold the correct values depending on the default shell. Close #1314 --- src/terminal.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/terminal.go b/src/terminal.go index c807a4ba..4eaf3f0b 100644 --- a/src/terminal.go +++ b/src/terminal.go @@ -613,7 +613,6 @@ func (t *Terminal) resizeWindows() { pwidth += 1 } t.pwindow = t.tui.NewWindow(y+1, x+2, pwidth, h-2, tui.BorderNone) - os.Setenv("FZF_PREVIEW_HEIGHT", strconv.Itoa(h-2)) } switch t.preview.position { case posUp: @@ -1492,8 +1491,12 @@ func (t *Terminal) Loop() { cmd := util.ExecCommand(command, true) if t.pwindow != nil { env := os.Environ() - env = append(env, fmt.Sprintf("LINES=%d", t.pwindow.Height())) - env = append(env, fmt.Sprintf("COLUMNS=%d", t.pwindow.Width())) + lines := fmt.Sprintf("LINES=%d", t.pwindow.Height()) + columns := fmt.Sprintf("COLUMNS=%d", t.pwindow.Width()) + env = append(env, lines) + env = append(env, "FZF_PREVIEW_"+lines) + env = append(env, columns) + env = append(env, "FZF_PREVIEW_"+columns) cmd.Env = env } var out bytes.Buffer -- cgit v1.2.3