summary refs log tree commit diff
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2005-09-28 19:00:24 +0000
committerClint Adams <clint@users.sourceforge.net>2005-09-28 19:00:24 +0000
commit5d6995abb1104771ac94720b9a73c51e88e4c51f (patch)
tree18238251012b49643c34d2e1553dfc3bc7e0bf8c
parent9e3caedcd66b6deec098a6e037377cef518de7aa (diff)
downloadzsh-5d6995abb1104771ac94720b9a73c51e88e4c51f.tar.gz
zsh-5d6995abb1104771ac94720b9a73c51e88e4c51f.tar.xz
zsh-5d6995abb1104771ac94720b9a73c51e88e4c51f.zip
21781: cope with `iconv --list` output from glibc 2.3.5.
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_iconv2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d3af72cb4..eb1a48d70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-09-28  Clint Adams  <clint@zsh.org>
 
+	* 21781: Completion/Unix/Command/_iconv: cope with
+	`iconv --list` output from glibc 2.3.5.
+
 	* 21780: Completion/Debian/Command/_dlocate: completion for
 	dlocate.
 
diff --git a/Completion/Unix/Command/_iconv b/Completion/Unix/Command/_iconv
index 92fa17e34..2cd69b21a 100644
--- a/Completion/Unix/Command/_iconv
+++ b/Completion/Unix/Command/_iconv
@@ -26,7 +26,7 @@ if _pick_variant gnu=GNU unix --version; then
     else
       _wanted codesets expl 'code set' compadd "$@" \
 	  -M 'm:{a-zA-Z}={A-Za-z} r:|-=* r:|=*' \
-	  ${${${(f)"$(_call_program codesets iconv --list|sed -n '/^$/,$ p')"}## #}%//} && ret=0
+	  ${${${(f)"$(_call_program codesets iconv --list)"}## #}%//} && ret=0
     fi
   fi