linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-04-24 04:29:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'robbyrussell/master'

Browse source 
* robbyrussell/master: (37 commits)
  added assembly alias (#5107)
  Fix styling in cakephp3 completion
  Better cake3 completion
  Change vim command to $EDITOR for consistency (#5063)
  fixed bower completion error from issue #2694 (#5056)
  vagrant snapshot (#5032)
  Arcanist plugin (#5106)
  completion: zsh: improve main function selection
  gitfast: fix the prompt colour
  gitfast: update to upstream v2.8
  Add alias for oneline git tree with --all option
  gitfast: update to upstream v2.4
  gitfast: update to upstream v2.0
  znt: update to v2.1.15
  Add rbenv support for ruby version display
  Fix deprecated usage (#5050)
  Add 'gcn!' for the '--no-edit' option. (#4830)
  Add mvn options to ignore test failures (#5092)
  Add README to meteor plugin
  Add meteor plugin aliases
  ...
This commit is contained in:
Evan Chiu 2016-05-24 00:00:52 -07:00
commit db910ecd4b
58 changed files with 1788 additions and 248 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/theme-and-appearance.zsh
View file

@ -11,9 +11,9 @@ then
# 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'
elif [[ "$(uname -s)" == "OpenBSD" ]]; then
# On OpenBSD, "gls" (ls from GNU coreutils) and "colorls" (ls from base,
# with color and multibyte support) are available from ports. "colorls"
# will be installed on purpose and can't be pulled in by installing
# On OpenBSD, "gls" (ls from GNU coreutils) and "colorls" (ls from base,
# with color and multibyte support) are available from ports. "colorls"
# will be installed on purpose and can't be pulled in by installing
# coreutils, so prefer it to "gls".
gls --color -d . &>/dev/null 2>&1 && alias ls='gls --color=tty'
colorls -G -d . &>/dev/null 2>&1 && alias ls='colorls -G'
@ -22,10 +22,8 @@ then
fi
fi
#setopt no_beep
setopt auto_cd
setopt multios
setopt cdablevars
if [[ x$WINDOW != x ]]
then