xinb
/
zsh-autosuggestions
mirror of https://github.com/zsh-users/zsh-autosuggestions.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle versions of zsh where zpty does not set REPLY to fd of opened pty 

Based on e702ec4697/async.zsh (L400-L406)
This commit is contained in:
Eric Freese 2017-01-26 16:50:19 -07:00
parent f33b605a63
commit 16666da488
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/async.zsh
View File

@ -52,14 +52,26 @@ _zsh_autosuggest_async_recreate_pty() {
zpty -d $ZSH_AUTOSUGGEST_PTY_NAME &>/dev/null zpty -d $ZSH_AUTOSUGGEST_PTY_NAME &>/dev/null
fi fi
# REPLY stores the fd to read from # With newer versions of zsh, REPLY stores the fd to read from
typeset -h REPLY typeset -h REPLY
# If we won't get a fd back from zpty, try to guess it
if [ $_ZSH_AUTOSUGGEST_ZPTY_RETURNS_FD -eq 0 ]; then
integer -l zptyfd
exec {zptyfd}>&1 # Open a new file descriptor (above 10).
exec {zptyfd}>&- # Close it so it's free to be used by zpty.
fi
# Start a new pty running the server function # Start a new pty running the server function
zpty -b $ZSH_AUTOSUGGEST_PTY_NAME "_zsh_autosuggest_async_suggestion_server _zsh_autosuggest_strategy_$ZSH_AUTOSUGGEST_STRATEGY" zpty -b $ZSH_AUTOSUGGEST_PTY_NAME "_zsh_autosuggest_async_suggestion_server _zsh_autosuggest_strategy_$ZSH_AUTOSUGGEST_STRATEGY"
# Store the fd so we can destroy this pty later # Store the fd so we can destroy this pty later
if (( REPLY )); then
_ZSH_AUTOSUGGEST_PTY_FD=$REPLY _ZSH_AUTOSUGGEST_PTY_FD=$REPLY
else
_ZSH_AUTOSUGGEST_PTY_FD=$zptyfd
fi
# Set up input handler from the pty # Set up input handler from the pty
zle -F $_ZSH_AUTOSUGGEST_PTY_FD _zsh_autosuggest_async_suggestion_ready zle -F $_ZSH_AUTOSUGGEST_PTY_FD _zsh_autosuggest_async_suggestion_ready

14
zsh-autosuggestions.zsh
View File

@ -566,14 +566,26 @@ _zsh_autosuggest_async_recreate_pty() {
zpty -d $ZSH_AUTOSUGGEST_PTY_NAME &>/dev/null zpty -d $ZSH_AUTOSUGGEST_PTY_NAME &>/dev/null
fi fi
# REPLY stores the fd to read from # With newer versions of zsh, REPLY stores the fd to read from
typeset -h REPLY typeset -h REPLY
# If we won't get a fd back from zpty, try to guess it
if [ $_ZSH_AUTOSUGGEST_ZPTY_RETURNS_FD -eq 0 ]; then
integer -l zptyfd
exec {zptyfd}>&1 # Open a new file descriptor (above 10).
exec {zptyfd}>&- # Close it so it's free to be used by zpty.
fi
# Start a new pty running the server function # Start a new pty running the server function
zpty -b $ZSH_AUTOSUGGEST_PTY_NAME "_zsh_autosuggest_async_suggestion_server _zsh_autosuggest_strategy_$ZSH_AUTOSUGGEST_STRATEGY" zpty -b $ZSH_AUTOSUGGEST_PTY_NAME "_zsh_autosuggest_async_suggestion_server _zsh_autosuggest_strategy_$ZSH_AUTOSUGGEST_STRATEGY"
# Store the fd so we can destroy this pty later # Store the fd so we can destroy this pty later
if (( REPLY )); then
_ZSH_AUTOSUGGEST_PTY_FD=$REPLY _ZSH_AUTOSUGGEST_PTY_FD=$REPLY
else
_ZSH_AUTOSUGGEST_PTY_FD=$zptyfd
fi
# Set up input handler from the pty # Set up input handler from the pty
zle -F $_ZSH_AUTOSUGGEST_PTY_FD _zsh_autosuggest_async_suggestion_ready zle -F $_ZSH_AUTOSUGGEST_PTY_FD _zsh_autosuggest_async_suggestion_ready