From 93cb3758b5f08a6dbf30c6e3d2e1de9b0be52a63 Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Sun, 6 Apr 2025 13:04:53 +0900 Subject: [PATCH] 0.61.1 --- CHANGELOG.md | 4 ++++ install | 2 +- install.ps1 | 2 +- man/man1/fzf-tmux.1 | 2 +- man/man1/fzf.1 | 2 +- src/tui/light.go | 18 +++++++++++------- 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 618e9230..e0ddc838 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ CHANGELOG ========= +0.61.1 +------ +- Disable bracketed-paste mode on exit. This fixes issue where pasting breaks after running fzf on old bash versions that don't support the mode. + 0.61.0 ------ - Added `--ghost=TEXT` to display a ghost text when the input is empty diff --git a/install b/install index 539334ec..7bf3a3b5 100755 --- a/install +++ b/install @@ -2,7 +2,7 @@ set -u -version=0.61.0 +version=0.61.1 auto_completion= key_bindings= update_config=2 diff --git a/install.ps1 b/install.ps1 index dedca700..8119ca3b 100644 --- a/install.ps1 +++ b/install.ps1 @@ -1,4 +1,4 @@ -$version="0.61.0" +$version="0.61.1" $fzf_base=Split-Path -Parent $MyInvocation.MyCommand.Definition diff --git a/man/man1/fzf-tmux.1 b/man/man1/fzf-tmux.1 index da08dd40..bb5be6a0 100644 --- a/man/man1/fzf-tmux.1 +++ b/man/man1/fzf-tmux.1 @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. .. -.TH fzf\-tmux 1 "Mar 2025" "fzf 0.61.0" "fzf\-tmux - open fzf in tmux split pane" +.TH fzf\-tmux 1 "Apr 2025" "fzf 0.61.1" "fzf\-tmux - open fzf in tmux split pane" .SH NAME fzf\-tmux - open fzf in tmux split pane diff --git a/man/man1/fzf.1 b/man/man1/fzf.1 index 366cb3b2..b64b6100 100644 --- a/man/man1/fzf.1 +++ b/man/man1/fzf.1 @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. .. -.TH fzf 1 "Mar 2025" "fzf 0.61.0" "fzf - a command-line fuzzy finder" +.TH fzf 1 "Apr 2025" "fzf 0.61.1" "fzf - a command-line fuzzy finder" .SH NAME fzf - a command-line fuzzy finder diff --git a/src/tui/light.go b/src/tui/light.go index 1f3b5d72..4f5ae555 100644 --- a/src/tui/light.go +++ b/src/tui/light.go @@ -213,8 +213,7 @@ func (r *LightRenderer) Init() error { } } - r.enableMouse() - r.csi("?2004h") // Enable bracketed paste mode + r.enableModes() r.csi(fmt.Sprintf("%dA", r.MaxY()-1)) r.csi("G") r.csi("K") @@ -683,7 +682,7 @@ func (r *LightRenderer) rmcup() { } func (r *LightRenderer) Pause(clear bool) { - r.disableMouse() + r.disableModes() r.restoreTerminal() if clear { if r.fullscreen { @@ -696,12 +695,13 @@ func (r *LightRenderer) Pause(clear bool) { } } -func (r *LightRenderer) enableMouse() { +func (r *LightRenderer) enableModes() { if r.mouse { r.csi("?1000h") r.csi("?1002h") r.csi("?1006h") } + r.csi("?2004h") // Enable bracketed paste mode } func (r *LightRenderer) disableMouse() { @@ -712,6 +712,11 @@ func (r *LightRenderer) disableMouse() { } } +func (r *LightRenderer) disableModes() { + r.disableMouse() + r.csi("?2004l") +} + func (r *LightRenderer) Resume(clear bool, sigcont bool) { r.setupTerminal() if clear { @@ -720,7 +725,7 @@ func (r *LightRenderer) Resume(clear bool, sigcont bool) { } else { r.rmcup() } - r.enableMouse() + r.enableModes() r.flush() } else if sigcont && !r.fullscreen && r.mouse { // NOTE: SIGCONT (Coming back from CTRL-Z): @@ -775,8 +780,7 @@ func (r *LightRenderer) Close() { if !r.showCursor { r.csi("?25h") } - r.csi("?2004l") // Disable bracketed paste mode we enabled in Init() - r.disableMouse() + r.disableModes() r.flush() r.restoreTerminal() r.closePlatform()