about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Completion/compinit1
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8eb035d79..160909e94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-17  Bart Schaefer  <schaefer@brasslantern.com>
+
+	* 21880: Completion/compinit: explicitly set IFS to the usual
+	default string, plus carriage return, in case the surrounding
+	environment has messed with it or a file with CRLF line breaks
+	needs to be parsed.
+
 2005-10-17  Peter Stephenson  <pws@csr.com>
 
 	* unposted: Functions/Zle/define-composed-chars,
diff --git a/Completion/compinit b/Completion/compinit
index 76792fd0a..74a512fc3 100644
--- a/Completion/compinit
+++ b/Completion/compinit
@@ -156,6 +156,7 @@ _comp_options=(
 # and don't get confused by user's ZERR trap handlers.
 
 _comp_setup='setopt localoptions localtraps ${_comp_options[@]};
+             local IFS=$'\'\ \\t\\r\\n\\0\''
              exec </dev/null;
              trap - ZERR'