diff options
| author | Junegunn Choi <junegunn.c@gmail.com> | 2025-04-22 20:18:03 +0900 |
|---|---|---|
| committer | Junegunn Choi <junegunn.c@gmail.com> | 2025-04-22 20:20:21 +0900 |
| commit | 2a9c1c06a4a0f8afd75ab299459f438095d41515 (patch) | |
| tree | 4e6887e3b3e8bb6f427a4a7b565df7339ab9146a | |
| parent | 90ad1b7f223664a8490bcb18a101e39b5e13cb31 (diff) | |
| download | fzf-2a9c1c06a4a0f8afd75ab299459f438095d41515.tar.gz | |
Revert "Disable tmux popup when already running inside one (#4351)"
This reverts commit af8fe918d863b18160390a79cbf957ee28dead56.
Fix #4360
Fix #4359
| -rw-r--r-- | src/core.go | 2 | ||||
| -rw-r--r-- | src/proxy.go | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/core.go b/src/core.go index aaa444b2..42add205 100644 --- a/src/core.go +++ b/src/core.go @@ -39,7 +39,7 @@ func (r revision) compatible(other revision) bool { // Run starts fzf func Run(opts *Options) (int, error) { if opts.Filter == nil { - if opts.Tmux != nil && len(os.Getenv("TMUX")) > 0 && len(os.Getenv("TMUX_PANE")) > 0 && opts.Tmux.index >= opts.Height.index { + if opts.Tmux != nil && len(os.Getenv("TMUX")) > 0 && opts.Tmux.index >= opts.Height.index { return runTmux(os.Args, opts) } diff --git a/src/proxy.go b/src/proxy.go index 47c41474..958ae26f 100644 --- a/src/proxy.go +++ b/src/proxy.go @@ -98,8 +98,7 @@ func runProxy(commandPrefix string, cmdBuilder func(temp string, needBash bool) validIdentifier := regexp.MustCompile(`^[a-zA-Z_][a-zA-Z0-9_]*$`) for _, pairStr := range os.Environ() { pair := strings.SplitN(pairStr, "=", 2) - // TMUX_PANE is never set inside a tmux popup, and should not be set so as to not be detected as a regular tmux pane - if validIdentifier.MatchString(pair[0]) && pair[0] != "TMUX_PANE" { + if validIdentifier.MatchString(pair[0]) { exports = append(exports, fmt.Sprintf("export %s=%s", pair[0], escapeSingleQuote(pair[1]))) } else if strings.HasPrefix(pair[0], "BASH_FUNC_") && strings.HasSuffix(pair[0], "%%") { name := pair[0][10 : len(pair[0])-2] |