This commit is contained in:
Junegunn Choi 2025-04-06 13:04:53 +09:00
parent d22e75dcdd
commit 93cb3758b5
No known key found for this signature in database
GPG Key ID: 254BC280FEF9C627
6 changed files with 19 additions and 11 deletions

View File

@ -1,6 +1,10 @@
CHANGELOG 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 0.61.0
------ ------
- Added `--ghost=TEXT` to display a ghost text when the input is empty - Added `--ghost=TEXT` to display a ghost text when the input is empty

View File

@ -2,7 +2,7 @@
set -u set -u
version=0.61.0 version=0.61.1
auto_completion= auto_completion=
key_bindings= key_bindings=
update_config=2 update_config=2

View File

@ -1,4 +1,4 @@
$version="0.61.0" $version="0.61.1"
$fzf_base=Split-Path -Parent $MyInvocation.MyCommand.Definition $fzf_base=Split-Path -Parent $MyInvocation.MyCommand.Definition

View File

@ -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 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. 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 .SH NAME
fzf\-tmux - open fzf in tmux split pane fzf\-tmux - open fzf in tmux split pane

View File

@ -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 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. 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 .SH NAME
fzf - a command-line fuzzy finder fzf - a command-line fuzzy finder

View File

@ -213,8 +213,7 @@ func (r *LightRenderer) Init() error {
} }
} }
r.enableMouse() r.enableModes()
r.csi("?2004h") // Enable bracketed paste mode
r.csi(fmt.Sprintf("%dA", r.MaxY()-1)) r.csi(fmt.Sprintf("%dA", r.MaxY()-1))
r.csi("G") r.csi("G")
r.csi("K") r.csi("K")
@ -683,7 +682,7 @@ func (r *LightRenderer) rmcup() {
} }
func (r *LightRenderer) Pause(clear bool) { func (r *LightRenderer) Pause(clear bool) {
r.disableMouse() r.disableModes()
r.restoreTerminal() r.restoreTerminal()
if clear { if clear {
if r.fullscreen { if r.fullscreen {
@ -696,12 +695,13 @@ func (r *LightRenderer) Pause(clear bool) {
} }
} }
func (r *LightRenderer) enableMouse() { func (r *LightRenderer) enableModes() {
if r.mouse { if r.mouse {
r.csi("?1000h") r.csi("?1000h")
r.csi("?1002h") r.csi("?1002h")
r.csi("?1006h") r.csi("?1006h")
} }
r.csi("?2004h") // Enable bracketed paste mode
} }
func (r *LightRenderer) disableMouse() { 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) { func (r *LightRenderer) Resume(clear bool, sigcont bool) {
r.setupTerminal() r.setupTerminal()
if clear { if clear {
@ -720,7 +725,7 @@ func (r *LightRenderer) Resume(clear bool, sigcont bool) {
} else { } else {
r.rmcup() r.rmcup()
} }
r.enableMouse() r.enableModes()
r.flush() r.flush()
} else if sigcont && !r.fullscreen && r.mouse { } else if sigcont && !r.fullscreen && r.mouse {
// NOTE: SIGCONT (Coming back from CTRL-Z): // NOTE: SIGCONT (Coming back from CTRL-Z):
@ -775,8 +780,7 @@ func (r *LightRenderer) Close() {
if !r.showCursor { if !r.showCursor {
r.csi("?25h") r.csi("?25h")
} }
r.csi("?2004l") // Disable bracketed paste mode we enabled in Init() r.disableModes()
r.disableMouse()
r.flush() r.flush()
r.restoreTerminal() r.restoreTerminal()
r.closePlatform() r.closePlatform()