diff options
-rw-r--r-- | ChangeLog | 12 | ||||
-rw-r--r-- | Completion/X/Command/_mplayer | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 80de37809..0bd63d991 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-08-29 Mikael Magnusson <mikachu@gmail.com> + + * 29722: Completion/X/Command/_mplayer: escape colon. + + * 29706: Completion/X/Command/_mplayer: add missing ret=0. + 2011-08-28 Peter Stephenson <p.w.stephenson@ntlworld.com> * 29731: Src/builtin.c, Test/B04read.ztst: fix output from `read @@ -34,7 +40,7 @@ * 29703: Src/exec.c, Src/subst.c, Test/D03procsubst.ztst: * users/16253, users/16255: Src/utils.c, Test/D04parameter.ztst: - A nulstring should be split like an empty string. + A nulstring should be split like an empty string. * Anthony R Fletcher: users/16260: Completion/Unix/Command/_systemctl: new completion. @@ -1057,7 +1063,7 @@ 2011-03-01 Peter Stephenson <p.w.stephenson@ntlworld.com> * Baptiste: 28819: Completion/BSD/Command/_sockstat, - Completion/Unix/Command/_mount, + Completion/Unix/Command/_mount, Completion/Unix/Type/_file_systems: FreeBSD completion tweaks. 2011-02-28 Barton E. Schaefer <schaefer@zsh.org> @@ -15338,5 +15344,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5447 $ +* $Revision: 1.5448 $ ***************************************************** diff --git a/Completion/X/Command/_mplayer b/Completion/X/Command/_mplayer index 665f44e67..01ba3a825 100644 --- a/Completion/X/Command/_mplayer +++ b/Completion/X/Command/_mplayer @@ -77,7 +77,7 @@ _x_arguments -C -s \ '-sid[turn on DVD subtitles]:language id' \ '-speed[set playback speed rate]:playback speed rate' \ '-srate[specify frequency of audio playback]:frequency (Hz)' \ - '-ss[seek to given time position]:position (hh:mm\[\:ss\])' \ + '-ss[seek to given time position]:position (hh\:mm\[\:ss\])' \ '-sstep[specify time between displayed frames]:time (seconds)' \ -ssf:mode -stop_xscreensaver \ '-stereo:mode:((0\:stereo 1\:left\ channel 2\:right\ channel))' \ @@ -108,7 +108,7 @@ _x_arguments -C -s \ '-z[specify compression level for png output]:compression-level:((0\:no\ compression 1 2 3 4 5 6\:default\ compression 7 8 9\:max\ compression))' \ '-zoom[use software scaling, where available (use with -nofs)]' \ -zrbw -zrcrop -zrdev -zrfd -zrhelp -zrnorm -zrquality -zr{h,v}dec -zr{x,y}doff \ - '(-use-stdin)*:video file:->mfiles' + '(-use-stdin)*:video file:->mfiles' && ret=0 case "$state" in mfiles) |