update _pine for pine 4.33, add echoti completion and update _echotc (14567)

4 files changed, 15 insertions, 7 deletions

diff --git a/Completion/Unix/Command/_pine b/Completion/Unix/Command/_pine
index 8eb49fe6a..7c64d8fe1 100644
--- a/Completion/Unix/Command/_pine
+++ b/Completion/Unix/Command/_pine
@@ -16,16 +16,19 @@ fi
 sortorder=( {subject,arrival,date,from,size}{,/reverse} )
 lusortorder=( dont-sort {nickname,fullname}{,-with-lists-last} )
 
-opts=( -h -F -conf -create_lu -pinerc )  # exclusive options
+opts=( -h -v -F -conf -create_lu -pinerc -copy_abook -copy_pinerc)  # exclusive options
 idx=( -f -c -i -I -n -o -sort )  # options used when viewing messages
 send=( -attach -attachlist -attach_and_delete -url )  # options when sending
 
 _arguments -C -s \
-  "($opts $idx $send -bail -k -z -r -p -P *)-h[display help]" \
+  "($opts $idx $send -bail -d -k -z -r -p -P *)-h[display help]" \
+  "($opts $idx $send -bail -d -k -z -r -p -P *)-v[display version information]" \
   "($opts $idx $send -r *)-F+[specify file to open and page through]:file:_files" \
   "($opts $idx $send *)-conf[print out fresh global configuration]" \
   "($opts $idx $send *)-pinerc[put fresh pinerc configuration in file]:file:_files" \
   "($opts $idx $send *)-create_lu[create .lu from script]:addressbook file:_files:sort order:(${(j: :)lusortorder})" \
+  "($opts $idx $send *)-copy_pinerc:pinerc file:_files:remote folder" \
+  "($opts $idx $send *)-copy_abook:addressbook file:_files:remote folder" \
   "($opts $idx -url)-attach[go directly into composer with given file]:file:_files" \
   "($opts $idx -url)-attachlist[go to composer with given files]:file:_files" \
   "($opts $idx -url)-attach_and_delete[go to composer, attach file, delete when finished]:file:_files" \
@@ -37,11 +40,13 @@ _arguments -C -s \
   "($opts $send)-I+[specify initial keystrokes to be executed]:keystrokes" \
   "($opts $send)-n+[entry in index to begin on]:number:_guard '[0-9]#'" \
   "($opts $send)-o[open first folder read-only]" \
-  "(-F -h)-r[restricted - can only send mail to oneself]" \
+  "(-F -h -v)-r[restricted - can only send mail to oneself]" \
+  "(-h -v)-d[set debug level]:debug:(0 1 2 3 4 5 6 7 8 9 flush timestamp imap= numfiles= verbose=)" \
   "(${opts#-F})-k[force use of function keys]" \
   "(${opts#-F})-z[allow use of ^Z suspension]" \
   "(${opts#-F})-p+[use alternate .pinerc file]:alternate pinerc:_files" \
   "(${opts#-F})-P+[use alternate pine.conf file]:alternate pine.conf:_files" \
+  "(${opts#-F})-x[use configuration exceptions file]:configuration exceptions file:_files" \
   "(${opts#-F})-bail[exit if pinerc file doesn't already exist]" \
   '*::recipient:->userhost' \
   ${^_cache_pine_options}':option value' && return 0
diff --git a/Completion/Zsh/Command/.distfiles b/Completion/Zsh/Command/.distfiles
index 69c326eb9..4e75e0e3d 100644
--- a/Completion/Zsh/Command/.distfiles
+++ b/Completion/Zsh/Command/.distfiles
@@ -6,5 +6,5 @@ _builtin     _emulate     _precommand  _setopt      _unsetopt    _zle
 _cd          _enable      _print       _source      _wait        _zmodload
 _command     _fc          _prompt      _stat        _which       _zpty
 _compdef     _hash        _read        _trap        _zcompile    _zstyle
-_ttyctl      _ulimit      _vared       _alias       _jobs_builtin
+_echoti      _ttyctl      _ulimit      _vared       _alias       _jobs_builtin
 '
diff --git a/Completion/Zsh/Command/_echotc b/Completion/Zsh/Command/_echotc
index cc07b9cd0..79eb6d91f 100644
--- a/Completion/Zsh/Command/_echotc
+++ b/Completion/Zsh/Command/_echotc
@@ -2,6 +2,4 @@
 
 local expl
 
-_wanted arguments expl 'terminal capability' \
-    compadd al dc dl do le up al bl cd ce cl cr \
-            dc dl do ho is le ma nd nl se so up
+_wanted arguments expl 'terminal capability' compadd -k termcap
diff --git a/Completion/Zsh/Command/_echoti b/Completion/Zsh/Command/_echoti
new file mode 100644
index 000000000..ed3a98f4c
--- /dev/null
+++ b/Completion/Zsh/Command/_echoti
@@ -0,0 +1,5 @@
+#compdef echoti
+
+local expl
+
+_wanted arguments expl 'terminal capability' compadd -k terminfo