41904: new deborphan and updated xrandr completions

3 files changed, 52 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index afb3ce8da..d5e55546e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-16  Peter Stephenson  <p.stephenson@samsung.com>
+
+	* gi1242+zsh: 41904: Completion/Debian/Command/_deborphan,
+	Completion/X/Command/_xrandr: new and updated completions.
+
 2017-10-15  Barton E. Schaefer  <schaefer@zsh.org>
 
 	* 41898: Functions/Zle/edit-command-line: handle multi-word values
diff --git a/Completion/Debian/Command/_deborphan b/Completion/Debian/Command/_deborphan
new file mode 100644
index 000000000..f52d0d7e7
--- /dev/null
+++ b/Completion/Debian/Command/_deborphan
@@ -0,0 +1,42 @@
+#compdef deborphan
+
+local keep=/var/lib/deborphan/keep
+_arguments : \
+  {--help,-h}'[help]' \
+  {--status-file,-f}'[statusfile]:file:_files' \
+  {--version,-v}'[version]' \
+  {--show-deps,-d}'[show dependencies for packages that have them]' \
+  {--show-priority,-P}'[show priority of packages found]' \
+  {--show-section,-s}'[show the sections the packages are in]' \
+  --no-show-section'[do not show sections]' \
+  {--show-size,-z}'[show installed size of packages found]' \
+  {--all-packages,-a}'[compare all packages, not just libs]' \
+  {--exclude,-e}'[work as if packages in LIST were not installed]:LIST:' \
+  {--force-hold,-H}'[Ignore hold flags.]' \
+  {--nice-mode,-n}'[Disable checks for "recommends" and "suggests".]' \
+  --ignore-recommends'[Disable checks for recommends.]' \
+  --ignore-suggests'[Disable checks for "suggests".]' \
+  {--priority,-p}'[PRIOR  Select only packages with priority >= PRIOR.]:PRIOR:' \
+  --find-config'[Find "orphaned" configuration files.]' \
+  --libdevel'[Search in libdevel in addition to libs and oldlibs.]' \
+  {--add-keep,-A}'[PKGS.. Never report PKGS.]:*:package:_deb_packages installed' \
+  {--keep-file,-k}'[Use FILE to get/store info about kept packages.]:file:_files' \
+  {--list-keep,-L}'[List the packages that are never reported.]' \
+  {--del-keep,-R}"[PKGS.. Remove PKGS from the 'keep' file.]:*:package:_values package $(< $keep)" \
+  {--zero-keep,-Z}'[Remove all packages from the "keep" file.]' \
+  --guess-common'[Try to report common packages.]' \
+  --guess-data'[Try to report data packages.]' \
+  --guess-debug'[Try to report debugging libraries.]' \
+  --guess-dev'[Try to report development packages.]' \
+  --guess-doc'[Try to report documentation packages.]' \
+  --guess-dummy'[Try to report dummy packages.]' \
+  --guess-kernel'[Try to report kernel modules.]' \
+  --guess-interpreters'[Try to report interpreter libraries.]' \
+  --guess-mono'[Try to report mono libraries.]' \
+  --guess-perl'[Try to report perl libraries.]' \
+  --guess-pike'[Try to report pike libraries.]' \
+  --guess-python'[Try to report python libraries.]' \
+  --guess-ruby'[Try to report ruby libraries.]' \
+  --guess-section'[Try to report libraries in wrong sections.]' \
+  --guess-all'[Try all of the above.]' \
+  --guess-only'[Use --guess options only.]'
diff --git a/Completion/X/Command/_xrandr b/Completion/X/Command/_xrandr
index b0851569e..26d8cd082 100644
--- a/Completion/X/Command/_xrandr
+++ b/Completion/X/Command/_xrandr
@@ -58,8 +58,11 @@ case $state in
     esac
   ;;
   outputs)
-    _wanted outputs expl output compadd \
-        ${(uo)${(M)${(f)"$(_call_program outputs xrandr)"}:#* connected*}%% *} && return 0
+    local -a xrandr_output=(${(f)"$(_call_program outputs xrandr)"})
+    _alternative \
+	'connected:connected outputs:('${(j: :)${(uo)${(M)xrandr_output:#* connected*}%% *}}')' \
+	'disconnected:disconnected outputs:('${(j: :)${(uo)${(M)xrandr_output:#* disconnected*}%% *}}')' \
+	&& return 0
   ;;
   modes)
     _wanted modes expl mode compadd \