Skip to content

O
oh-my-zsh
Commit 6dbeb7bb authored by Marc Cornellà's avatar Marc Cornellà
Browse files
Options

Merge branch 'fix/weird-autocompletion'

parents 0ebe3596 cc36063c
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
lib/theme-and-appearance.zsh
View file @ 6dbeb7bb
...@@ -11,9 +11,9 @@ then ...@@ -11,9 +11,9 @@ then
# otherwise, leave ls as is, because NetBSD's ls doesn't support -G # otherwise, leave ls as is, because NetBSD's ls doesn't support -G
gls --color -d . &>/dev/null 2>&1 && alias ls='gls --color=tty' gls --color -d . &>/dev/null 2>&1 && alias ls='gls --color=tty'
elif [[ "$(uname -s)" == "OpenBSD" ]]; then elif [[ "$(uname -s)" == "OpenBSD" ]]; then
# On OpenBSD, "gls" (ls from GNU coreutils) and "colorls" (ls from base, # On OpenBSD, "gls" (ls from GNU coreutils) and "colorls" (ls from base,
# with color and multibyte support) are available from ports. "colorls" # with color and multibyte support) are available from ports. "colorls"
# will be installed on purpose and can't be pulled in by installing # will be installed on purpose and can't be pulled in by installing
# coreutils, so prefer it to "gls". # coreutils, so prefer it to "gls".
gls --color -d . &>/dev/null 2>&1 && alias ls='gls --color=tty' gls --color -d . &>/dev/null 2>&1 && alias ls='gls --color=tty'
colorls -G -d . &>/dev/null 2>&1 && alias ls='colorls -G' colorls -G -d . &>/dev/null 2>&1 && alias ls='colorls -G'
...@@ -22,10 +22,8 @@ then ...@@ -22,10 +22,8 @@ then
fi fi
fi fi
#setopt no_beep
setopt auto_cd setopt auto_cd
setopt multios setopt multios
setopt cdablevars
if [[ x$WINDOW != x ]] if [[ x$WINDOW != x ]]
then then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment