From 6c09f2a45c5541e9c207d14fc7aa21a4a0066bde Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 4 May 2024 03:03:19 +0200
Subject: Merging upstream version 1:2.12.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 completions/hunspell | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

(limited to 'completions/hunspell')

diff --git a/completions/hunspell b/completions/hunspell
index 92b4fe8..28cb7df 100644
--- a/completions/hunspell
+++ b/completions/hunspell
@@ -1,43 +1,40 @@
 # hunspell(1) completion                                   -*- shell-script -*-
 
-_hunspell()
+_comp_cmd_hunspell()
 {
-    local cur prev words cword
-    _init_completion || return
+    local cur prev words cword comp_args
+    _comp_initialize -- "$@" || return
 
     case $prev in
         --help | --version | -vv | -[hPv])
             return
             ;;
         -d)
-            local IFS=$' \t\n' reset=$(shopt -p nullglob)
-            shopt -s nullglob
-            local -a dicts=(/usr/share/hunspell/*.dic
-                /usr/local/share/hunspell/*.dic)
-            dicts=("${dicts[@]##*/}")
-            dicts=("${dicts[@]%.dic}")
-            $reset
-            IFS=$'\n'
-            COMPREPLY=($(compgen -W '${dicts[@]}' -- "$cur"))
+            local -a dicts
+            if _comp_expand_glob dicts '/usr/share/hunspell/*.dic /usr/local/share/hunspell/*.dic'; then
+                dicts=("${dicts[@]##*/}")
+                dicts=("${dicts[@]%.dic}")
+                _comp_compgen -- -W '"${dicts[@]}"'
+            fi
             return
             ;;
         -i)
-            _xfunc iconv _iconv_charsets
+            _comp_compgen -x iconv charsets
             return
             ;;
         -p)
-            _filedir
+            _comp_compgen_filedir
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         return
     fi
 
-    _filedir
+    _comp_compgen_filedir
 } &&
-    complete -F _hunspell hunspell
+    complete -F _comp_cmd_hunspell hunspell
 
 # ex: filetype=sh
-- 
cgit v1.2.3