summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBart Schaefer <barts@users.sourceforge.net>2000-05-19 16:04:16 +0000
committerBart Schaefer <barts@users.sourceforge.net>2000-05-19 16:04:16 +0000
commitaea69f6e640a47f2f442bf58504c94dc8091e2ab (patch)
tree02f4c0764f6aaecb17a659c419dbb24e51ee1e79
parent529158f82f1959019c21c0d6e7081a6dae677401 (diff)
downloadzsh-aea69f6e640a47f2f442bf58504c94dc8091e2ab.tar.gz
zsh-aea69f6e640a47f2f442bf58504c94dc8091e2ab.zip
11469: Locally unset the errexit option and ZERR trap.
-rw-r--r--ChangeLog4
-rw-r--r--Completion/Commands/_complete_debug2
-rw-r--r--Completion/Core/_main_complete3
3 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1026efa63..d81143076 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2000-05-19 Bart Schaefer <schaefer@zsh.org>
+ * 11469: Completion/Commands/_complete_debug,
+ Completion/Core/_main_complete: Locally unset the errexit option
+ and ZERR trap.
+
* 11461: Src/builtin.c: Make "read" interruptible even when used
in the tail of a pipeline.
diff --git a/Completion/Commands/_complete_debug b/Completion/Commands/_complete_debug
index cbbe41e43..7672c75ea 100644
--- a/Completion/Commands/_complete_debug
+++ b/Completion/Commands/_complete_debug
@@ -3,6 +3,8 @@
setopt localoptions nullglob rcexpandparam extendedglob
unsetopt markdirs globsubst shwordsplit nounset ksharrays
+setopt localtraps noerrexit ; trap - ZERR
+
(( $+_debug_count )) || integer -g _debug_count
local tmp=${TMPPREFIX}${$}${words[1]:t}$[++_debug_count]
local w="${(qq)words}"
diff --git a/Completion/Core/_main_complete b/Completion/Core/_main_complete
index a67e57db6..19295a991 100644
--- a/Completion/Core/_main_complete
+++ b/Completion/Core/_main_complete
@@ -20,6 +20,9 @@ setopt localoptions nullglob rcexpandparam extendedglob
unsetopt markdirs globsubst shwordsplit nounset ksharrays
exec </dev/null # ZLE closes stdin, which can cause errors
+# Failed returns from this code are not real errors
+setopt localtraps noerrexit ; trap - ZERR
+
local func funcs ret=1 tmp _compskip format nm call \
_completers _completer _completer_num curtag _comp_force_list \
_matchers _matcher _matcher_num _comp_tags _comp_mesg \