diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Completion/Unix/Command/_bzr | 12 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 19 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 6e465c34f..0dcbf3e75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2014-04-23 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * Sebastien Alaiwan: 32562: Completion/Unix/Command/_bzr: + updates for bzr completion. + + * Jasper Lievisse Adriaanse: 32558: configure.ac: + _XOPEN_SOURCE_EXTENDED now works OK on OpenBSD. + 2014-04-25 Barton E. Schaefer <schaefer@zsh.org> * 32580: Src/hist.c: avoid indefinite wait in lockhistfile() by diff --git a/Completion/Unix/Command/_bzr b/Completion/Unix/Command/_bzr index ab9fd728d..c28c2148e 100644 --- a/Completion/Unix/Command/_bzr +++ b/Completion/Unix/Command/_bzr @@ -46,6 +46,14 @@ _bzr_versionedFiles() { return 0 } +(( $+functions[_bzr_modifiedFiles] )) || +_bzr_modifiedFiles() { + local fileList + fileList=(${(ps:\0:)"$(bzr status . --versioned --short | cut -b 5- | tr '\n' '\0')"}) + compadd -af fileList + return 0 +} + (( $+functions[_bzr_completeParents] )) || _bzr_completeParents() { local parentFile=$(bzr root 2>/dev/null)/.bzr/branch/parent @@ -214,7 +222,7 @@ case $cmd in '--unchanged[include unchanged files]' '(-q --quiet -v --verbose)'{--quiet,-q}'[be quiet]' '(-v --verbose -q --quiet)'{--verbose,-v}'[display more information]' - '*:modified files:_bzr_versionedFiles' + '*:modified files:_bzr_modifiedFiles' ) ;; @@ -300,7 +308,7 @@ case $cmd in args+=( '--no-backup[skip generation of backup~ files]' '(-r --revision)'{--revision=,-r}'[revision]:revision:' - '*:file:_bzr_versionedFiles' + '*:file:_bzr_modifiedFiles' ) ;; diff --git a/configure.ac b/configure.ac index 776b90828..a2a6b9eae 100644 --- a/configure.ac +++ b/configure.ac @@ -756,7 +756,7 @@ AH_TEMPLATE([ZSH_NO_XOPEN], AC_CACHE_CHECK(if _XOPEN_SOURCE_EXTENDED should not be defined, zsh_cv_no_xopen, [[case "$host_os" in - *openbsd*|*freebsd5*|*freebsd6.[012]*|*aix*) + *freebsd5*|*freebsd6.[012]*|*aix*) zsh_cv_no_xopen=yes ;; *) |