summary refs log tree commit diff
diff options
context:
space:
mode:
authorBart Schaefer <barts@users.sourceforge.net>2000-05-12 02:31:05 +0000
committerBart Schaefer <barts@users.sourceforge.net>2000-05-12 02:31:05 +0000
commit1452bfe1017cf83889919d561d3046c1b9ba1fb5 (patch)
tree6f13d0ef367fe905ad85d166c8c9b86ba403621e
parent0768b190ba9347bcfe2d43da2b61eded53173635 (diff)
downloadzsh-1452bfe1017cf83889919d561d3046c1b9ba1fb5.tar.gz
zsh-1452bfe1017cf83889919d561d3046c1b9ba1fb5.tar.xz
zsh-1452bfe1017cf83889919d561d3046c1b9ba1fb5.zip
11332: Test descriptors correctly for redirect/restore of stderr; plus an
aesthetic tweak.
-rw-r--r--ChangeLog11
-rw-r--r--Completion/Commands/_complete_debug5
2 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index daaa88b36..ccc946bac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-05-11  Bart Schaefer  <schaefer@zsh.org>
 
+	* 11332: Completion/Commands/_complete_debug: Test descriptors
+	correctly for redirect/restore of stderr; plus aesthetic tweak.
+
 	* 11326: Src/exec.c: Don't reinitialize SHTTY upon "exec < file"
 	when ZLE is active.
 
@@ -12,21 +15,21 @@
 	* 11324: Completion/Base/_argument_sets, Completion/Base/_arguments,
  	Src/Zle/computil.c: make _argument_sets add the options as
  	defaults when there is nothing else to complete
-	
+
 	* 11321: Completion/Core/_files: _files used alternative tag-order
  	values even if not needed
-	
+
 	* 11320: Completion/Base/_argument_sets, Completion/Base/_arguments,
  	Doc/Zsh/compsys.yo, Src/Zle/computil.c: allow internally-mutually
  	exclusive sets in _argument_sets; fixes for _argument_sets and the
  	C-code forit
-	
+
 	* 11319: Completion/Core/_main_complete, Doc/Zsh/compsys.yo,
  	Doc/Zsh/mod_complist.yo, Src/Zle/compcore.c, Src/Zle/complist.c:
  	make ^G in menu-selection restore the old command line; add
  	select=long* values for menu style to start menu-selection if list
  	is too long for screen
-	
+
 2000-05-11  Oliver Kiddle  <opk@zsh.org>
 
 	* 11315: Doc/Zsh/builtins.yo, Doc/Zsh/compsys.yo, Doc/Zsh/compwid.yo,
diff --git a/Completion/Commands/_complete_debug b/Completion/Commands/_complete_debug
index be3f7672f..cbbe41e43 100644
--- a/Completion/Commands/_complete_debug
+++ b/Completion/Commands/_complete_debug
@@ -5,8 +5,9 @@ unsetopt markdirs globsubst shwordsplit nounset ksharrays
 
 (( $+_debug_count )) || integer -g _debug_count
 local tmp=${TMPPREFIX}${$}${words[1]:t}$[++_debug_count]
-local w="${(qqq)words}"
+local w="${(qq)words}"
 
+exec 3>&-	# Too bad if somebody else is using it ...
 [[ -t 2 ]] && exec 3>&2 2>| $tmp
 
 setopt xtrace
@@ -14,7 +15,7 @@ _main_complete
 integer ret=$?
 unsetopt xtrace
 
-[[ -t 2 ]] || {
+[[ -t 3 ]] && {
     ## Calling "print -s" during completion is presently broken.
     # _message -r "Trace output left in $tmp (up-history to view)"
     # print -sR "${VISUAL:-${EDITOR:-${PAGER:-more}}} $tmp ;: $w"