summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>2023-12-16 23:22:58 +0900
committerJun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>2023-12-16 23:22:58 +0900
commita528af5c57436c730144e35d97547163c57c8420 (patch)
treeebfbe113df7880fdd9dfd09a9c1954ee5f864aa6
parent4c89849c98172c951a9def3690e8647dae76308f (diff)
downloadzsh-a528af5c57436c730144e35d97547163c57c8420.tar.gz
zsh-a528af5c57436c730144e35d97547163c57c8420.zip
52413: support Citrus version of iconv on macOS, DragonFly, NetBSD
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_iconv2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c60d4733..e7b785c7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-12-06 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
+
+ * 52413: Completion/Unix/Command/_iconv: support Citrus version
+ on macOS, DragonFly and NetBSD
+
2023-12-13 Oliver Kiddle <opk@zsh.org>
* Florian Weimer: 52383: configure.ac: Avoid incompatible pointer
diff --git a/Completion/Unix/Command/_iconv b/Completion/Unix/Command/_iconv
index bf04acfe4..fba0b9afe 100644
--- a/Completion/Unix/Command/_iconv
+++ b/Completion/Unix/Command/_iconv
@@ -63,7 +63,7 @@ else
'1:file:_files' && return 0
if [[ $state = codeset ]]; then
- if [[ $OSTYPE = freebsd* ]]; then
+ if [[ $OSTYPE = (freebsd|dragonfly|netbsd|darwin)* ]]; then
codeset=( $(_call_program codesets $words[1] -l) )
elif [[ -f /usr/lib/iconv/iconv_data ]]; then # IRIX & Solaris
codeset=( ${${(f)"$(</usr/lib/iconv/iconv_data)"}%%[[:blank:]]*} )