Merge branch 'master' into dev

This commit is contained in:
rupa committed 2013-03-03 09:47:58 -05:00
commit 8fc6ece944
3 files changed
+12 -10

No files matched your search

+2 -2
View File
@@ -6,7 +6,7 @@ NAME
z - jump around
SYNOPSIS
z [-c] [-h] [-l] [-r] [-t] [regex1 regex2 ... regexn]
z [-chlrt] [regex1 regex2 ... regexn]
AVAILABILITY
bash, zsh
@@ -105,7 +105,7 @@ ENVIRONMENT
The environment variable $_Z_NO_RESOLVE_SYMLINKS can be set to prevent
resolving of symlinks. If it is not set, symbolic links will be
resolved when added to the datafile..
resolved when added to the datafile.
In bash, z prepends a command to the PROMPT_COMMAND environment vari-
able to maintain its database. In zsh, z appends a function _z_precmd
+2 -2
View File
@@ -4,7 +4,7 @@ NAME
z \- jump around
.SH
SYNOPSIS
z [\-c] [\-h] [\-l] [\-r] [\-t] [regex1 regex2 ... regexn]
z [\-chlrt] [regex1 regex2 ... regexn]
.SH
AVAILABILITY
bash, zsh
@@ -129,7 +129,7 @@ location. If it is not defined, the location defaults to \fB$HOME/.z\fR.
.P
The environment variable \fB$_Z_NO_RESOLVE_SYMLINKS\fR can be set to prevent
resolving of symlinks. If it is not set, symbolic links will be resolved when
added to the datafile..
added to the datafile.
.P
In bash, \fBz\fR prepends a command to the \fBPROMPT_COMMAND\fR environment
variable to maintain its database. In zsh, \fBz\fR appends a function
+8 -6
View File
@@ -101,15 +101,17 @@ _z() {
else
# list/go
while [ "$1" ]; do case "$1" in
-c) local fnd="$PWD $fnd";;
-h) echo "${_Z_CMD:-z} [-c][-h][-l][-r][-t] args" >&2; return;;
-l) local list=1;;
-r) local typ="rank";;
-t) local typ="recent";;
--) while [ "$1" ]; do shift; local fnd="$fnd $1";done;;
-*) local opt=${1:1}; while [ "$opt" ]; do case ${opt:0:1} in
c) local fnd="^$PWD $fnd";;
h) echo "${_Z_CMD:-z} [-chlrt] args" >&2; return;;
l) local list=1;;
r) local typ="rank";;
t) local typ="recent";;
esac; opt=${opt:1}; done;;
*) local fnd="$fnd $1";;
esac; local last=$1; shift; done
[ "$fnd" -a "$fnd" != "$PWD " ] || local list=1
[ "$fnd" -a "$fnd" != "^$PWD " ] || local list=1
# if we hit enter on a completion just go there
case "$last" in