Merge branch 'master' into 1.x

7 files changed, 71 insertions, 15 deletions

diff --git a/CHANGES b/CHANGES
index 25cba1bc..5e2e02c7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,7 @@ bash-completion (1.3)
   * added pure-perl perldoc completion helper, using work from Aristotle 
     Pagaltzis (pagaltzis@gmx.de)
   * added completions for xfreerdp and iscsiadm
+  * updated xm subcommands list
 
   [ David Paleino ]
   * Fixed "service" completion, thanks to John Hedges (Debian: #586210)
@@ -13,9 +14,9 @@ bash-completion (1.3)
   [ Ville Skyttä ]
   * Activate hping2 completion also for hping and hping3.
   * Add badblocks, compgen, crontab, dumpe2fs, e2freefrag, e2label, ether-wake,
-    filefrag, growisofs, iftop, ip (Debian: #600617), lrzip, lsof, portecle,
-    POSIX sh, sha{,224,256,384,512}sum, sysbench, tune2fs, xmodmap, and xrdb
-    completions.
+    filefrag, growisofs, iftop, ip (Debian: #600617), lrzip, lsof, mktemp,
+    portecle, POSIX sh, sha{,224,256,384,512}sum, sysbench, tune2fs, xmodmap,
+    and xrdb completions.
   * Add *.gif (Alioth: #312512), *.m2t (Alioth: #312770), *.3gpp, *.3gpp2,
     *.awb, and *.iso (Alioth: #311420) to mplayer filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.
@@ -48,6 +49,7 @@ bash-completion (1.3)
   * Ignore muttrc source entries that are not files (Alioth: #312881).
   * Re-enable postgresql database and user completion (Alioth: #312914,
     Ubuntu: #164772).
+  * Add *.fdf to various PDF viewer completions.
 
   [ Freddy Vulto ]
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
diff --git a/bash_completion b/bash_completion
index 5ee3939f..a9b8120a 100644
--- a/bash_completion
+++ b/bash_completion
@@ -84,9 +84,9 @@ complete -f -X '!*.@(gif|jp?(e)g|tif?(f)|png|p[bgp]m|bmp|x[bp]m|rle|rgb|pcx|fits
 complete -f -X '!*.@(@(?(e)ps|?(E)PS|pdf|PDF)?(.gz|.GZ|.bz2|.BZ2|.Z))' gv ggv kghostview
 complete -f -X '!*.@(dvi|DVI)?(.@(gz|Z|bz2))' xdvi kdvi
 complete -f -X '!*.dvi' dvips dviselect dvitype dvipdf advi dvipdfm dvipdfmx
-complete -f -X '!*.pdf' acroread gpdf xpdf
+complete -f -X '!*.[pf]df' acroread gpdf xpdf
 complete -f -X '!*.@(?(e)ps|pdf)' kpdf
-complete -f -X '!*.@(@(?(e)ps|?(E)PS|pdf|PDF|dvi|DVI)?(.gz|.GZ|.bz2|.BZ2)|cb[rz]|djv?(u)|gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|fdf)' evince
+complete -f -X '!*.@(@(?(e)ps|?(E)PS|[pf]df|[PF]DF|dvi|DVI)?(.gz|.GZ|.bz2|.BZ2)|cb[rz]|djv?(u)|gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|fdf)' evince
 complete -f -X '!*.@(okular|@(?(e|x)ps|?(E|X)PS|pdf|PDF|dvi|DVI|cb[rz]|CB[RZ]|djv?(u)|DJV?(U)|dvi|DVI|gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|GIF|JP?(E)G|MIFF|TIF?(F)|PN[GM]|P[BGP]M|BMP|XPM|ICO|XWD|TGA|PCX|epub|EPUB|odt|ODT|fb?(2)|FB?(2)|mobi|MOBI|g3|G3|chm|CHM|fdf|FDF)?(.?(gz|GZ|bz2|BZ2)))' okular
 complete -f -X '!*.@(?(e)ps|pdf)' ps2pdf ps2pdf12 ps2pdf13 ps2pdf14 ps2pdfwr
 complete -f -X '!*.texi*' makeinfo texi2html
@@ -128,7 +128,7 @@ complete -f -X '!@(*.@(ks|jks|jceks|p12|pfx|bks|ubr|gkr|cer|crt|cert|p7b|pkipath
 # start of section containing compspecs that can be handled within bash
 
 # user commands see only users
-complete -u su write chfn groups slay w sux
+complete -u su write chfn groups slay w sux runuser
 
 # bg completes with stopped jobs
 complete -A stopped -P '"%' -S '"' bg
diff --git a/completions/coreutils b/completions/coreutils
index 299aabe0..33d58cf7 100644
--- a/completions/coreutils
+++ b/completions/coreutils
@@ -112,6 +112,34 @@ _id()
 } &&
 complete -F _id id
 
+# mktemp(1) completion
+#
+have mktemp &&
+_mktemp()
+{
+    COMPREPLY=()
+    local cur prev split=false
+    _get_comp_words_by_ref cur prev
+
+    _split_longopt && split=true
+
+    case "$prev" in
+        --help|--version|--suffix)
+            return 0
+            ;;
+        --tmpdir|-p)
+            _filedir -d
+            return 0
+            ;;
+    esac
+
+    $split && return 0
+
+    [[ "$cur" == -* ]] && \
+        COMPREPLY=( $( compgen -W '-d -u -q -p -t' -- "$cur" ) )
+} &&
+complete -F _mktemp mktemp
+
 # Local variables:
 # mode: shell-script
 # sh-basic-offset: 4
diff --git a/completions/mplayer b/completions/mplayer
index de1aea51..39711370 100644
--- a/completions/mplayer
+++ b/completions/mplayer
@@ -237,6 +237,10 @@ _mplayer()
             COMPREPLY=( $( compgen -W 'force= list=' -- "$cur" ) )
             return 0
             ;;
+        -noconfig)
+            COMPREPLY=( $( compgen -W 'all gui system user' -- "$cur" ) )
+            return 0
+            ;;
     esac
 
     case $cur in
diff --git a/completions/xm b/completions/xm
index 4087a710..f9f69a29 100644
--- a/completions/xm
+++ b/completions/xm
@@ -22,15 +22,16 @@ _xm()
     COMPREPLY=()
     _get_comp_words_by_ref cur prev
 
-    commands='console create new delete destroy domid domname dump-core \
-        list mem-max mem-set migrate pause reboot rename restore \
-        resume save shutdown start suspend sysrq trigger top unpause \
-        uptime vcpu-list vcpu-pin vcpu-set debug-keys dmesg info log \
-        serve sched-credit sched-sedf block-attach block-detach \
-        block-list network-attach network-detach network-list \
-        vtpm-list vnet-list vnet-create vnet-delete labels addlabel \
-        rmlabel getlabel dry-run resources makepolicy loadpolicy \
-        cfgbootpolicy dumppolicy help'
+    commands='console vncviewer create new delete destroy domid domname \
+        dump-core list mem-max mem-set migrate pause reboot rename reset \
+        restore resume save shutdown start suspend sysrq trigger top unpause \
+        uptime usb-add usb-del vcpu-list vcpu-pin vcpu-set debug-keys dmesg \
+        info log serve sched-credit sched-sedf block-attach block-detach \
+        block-list block-configure network-attach network-detach network-list \
+        vtpm-list pci-attach pci-detach pci-list pci-list-assignable-devices \
+        scsi-attach scsi-detach scsi-list vnet-list vnet-create vnet-delete \
+        labels addlabel rmlabel getlabel dry-run resources dumppolicy \
+        setpolicy resetpolicy getpolicy shell help'
 
     if [[ $COMP_CWORD -eq 1 ]] ; then
         COMPREPLY=( $( compgen -W "$commands" -- "$cur" ) )
diff --git a/test/completion/mktemp.exp b/test/completion/mktemp.exp
new file mode 100644
index 00000000..b8296865
--- /dev/null
+++ b/test/completion/mktemp.exp
@@ -0,0 +1 @@
+assert_source_completions mktemp
diff --git a/test/lib/completions/mktemp.exp b/test/lib/completions/mktemp.exp
new file mode 100644
index 00000000..8b0a3be2
--- /dev/null
+++ b/test/lib/completions/mktemp.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "mktemp -"
+
+
+sync_after_int
+
+
+teardown