summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Completion/compinit1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7fbff294a..7017727bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-27 Barton E. Schaefer <schaefer@zsh.org>
+
+ * unposted (see users/22287): Completion/compinit: _comp_options
+ needs to disable ERR_RETURN along with ERR_EXIT
+
2016-12-24 Barton E. Schaefer <schaefer@zsh.org>
* Oliver: 40118: Functions/Zle/bracketed-paste-magic: relocate
diff --git a/Completion/compinit b/Completion/compinit
index 6612baca0..2715c47e8 100644
--- a/Completion/compinit
+++ b/Completion/compinit
@@ -142,6 +142,7 @@ _comp_options=(
NO_cshnullglob
NO_cshjunkiequotes
NO_errexit
+ NO_errreturn
NO_globassign
NO_globsubst
NO_histsubstpattern