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

Merge remote-tracking branch 'upstream/master'

Browse source 
Conflicts:
	lib/git.zsh
	plugins/common-aliases/common-aliases.plugin.zsh
	plugins/repo/repo.plugin.zsh
	templates/zshrc.zsh-template
This commit is contained in:
Gaetan Semet 2014-07-03 16:18:02 +02:00
commit ec49ae1a98
42 changed files with 333 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/jump/jump.plugin.zsh
View file

@ -64,7 +64,7 @@ function marks()
function _completemarks()
{
if [[ $(ls "${MARKPATH}" | wc -l) -gt 1 ]]; then
reply=($(ls $MARKPATH/**/*(-) | grep : | sed -E 's/(.*)\/([_\da-zA-Z\-]*):$/\2/g'))
reply=($(ls $MARKPATH/**/*(-) | grep : | sed -E 's/(.*)\/([_a-zA-Z0-9\.\-]*):$/\2/g'))
else
if readlink -e "${MARKPATH}"/* &>/dev/null; then
reply=($(ls "${MARKPATH}"))