zsh-workers/8501

2 files changed, 1 insertions, 52 deletions

diff --git a/Completion/Builtins/_popd b/Completion/Builtins/_popd
index 07dc4a87f..5b18ec228 100644
--- a/Completion/Builtins/_popd
+++ b/Completion/Builtins/_popd
@@ -37,43 +37,3 @@ compadd "$expl[@]" -ld lines -V dirs -Q - "$list[@]" && ret=0
 [[ -n $compstate[insert] ]] && compstate[insert]=menu && ret=0
 
 return ret
-#compdef popd
-
-# This just completes the numbers after +, showing the full directory list
-# with numbers. For - we do the same thing, but reverse the numbering (other
-# way round if pushdminus is set). Note that this function is also called
-# from _cd for cd and pushd.
-
-emulate -L zsh
-setopt extendedglob nonomatch
-
-[[ $PREFIX = [-+]* ]] || return 1
-
-local expl list lines revlines ret=1 i
-
-IPREFIX=$PREFIX[1]
-PREFIX=$PREFIX[2,-1]
-
-# get the list of directories with their canonical number
-# and turn the lines into an array, removing the current directory
-lines=( ${${(f)"$(dirs -v)"}##0*} )
-if [[ ( $IPREFIX = - && ! -o pushdminus ) ||
-      ( $IPREFIX = + && -o pushdminus ) ]]; then
-  integer i
-  revlines=( $lines )
-  for (( i = 1; i <= $#lines; i++ )); do
-    lines[$i]="$((i-1)) -- ${revlines[-$i]##[0-9]#[	 ]#}"
-  done
-else
-  for (( i = 1; i <= $#lines; i++ )); do
-    lines[$i]="$i -- ${lines[$i]##[0-9]#[	 ]#}"
-  done
-fi
-# get the array of numbers only
-list=(${lines%% *})
-_description expl 'directory stack index'
-compadd "$expl[@]" -ld lines -V dirs -Q - "$list[@]" && ret=0
-[[ -z $compstate[list] ]] && compstate[list]=list && ret=0
-[[ -n $compstate[insert] ]] && compstate[insert]=menu && ret=0
-
-return ret
diff --git a/configure.in b/configure.in
index 0bda454b9..aa93bf95e 100644
--- a/configure.in
+++ b/configure.in
@@ -250,13 +250,6 @@ AC_ARG_ENABLE(maildir-support,
   AC_DEFINE(MAILDIR_SUPPORT)
 fi])
 
-dnl Do you want to verify that tcsetpgrp works?
-undefine([tcsetpgrp-check])dnl
-AC_ARG_ENABLE(tcsetpgrp-check,
-[  --disable-tcsetpgrp-check     Disable test of tcsetpgrp],
-[tcsetpgrp-check="$enableval"], [tcsetpgrp-check=yes])
-
-
 dnl ------------------
 dnl CHECK THE COMPILER
 dnl ------------------
@@ -1247,12 +1240,8 @@ fi
 dnl -----------
 dnl if found tcsetpgrp, test to see if it actually works
 dnl for instance, BeOS R4.51 does not support it yet
-dnl When building where stdin is not a terminal, this
-dnl check will fail, resulting in no job control support
-dnl being available.  Because this is undesirable, allow
-dnl it to be skipped.
 dnl -----------
-if test $ac_cv_func_tcsetpgrp=yes -a $tcsetpgrp-check=yes; then
+if test -t 0 -a $ac_cv_func_tcsetpgrp=yes; then
     AC_CACHE_CHECK(if tcsetpgrp() actually works,
     zsh_cv_sys_tcsetpgrp,
     [AC_TRY_RUN([