vlc | branch: master | Rafaël Carré <[email protected]> | Sun May 29 20:47:01 2011 -0400| [8762bdebf7b8a2237deac1539f53fc789662c4c7] | committer: Rafaël Carré
fix zsh completion > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8762bdebf7b8a2237deac1539f53fc789662c4c7 --- extras/analyser/zsh.cpp | 6 ++++-- extras/analyser/zsh_completion.sh | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/extras/analyser/zsh.cpp b/extras/analyser/zsh.cpp index 6b5dd13..e152b42 100644 --- a/extras/analyser/zsh.cpp +++ b/extras/analyser/zsh.cpp @@ -123,7 +123,7 @@ void ParseModules( mumap &mods, mcmap &mods2 ) /* Exclude empty plugins (submodules don't have config options, they * are stored in the parent module) */ - if( p_module->b_submodule ) + if( p_module->parent ) continue; // p_item = ((module_t *)p_module->p_parent)->p_config; else @@ -186,7 +186,7 @@ void PrintModuleList( mumap &mods, mcmap &mods2 ) p_module->psz_object_name ) ); } } while( i_items++ < p_module->i_config_items && p_config++ ); - if( p_module->b_submodule ) + if( p_module->parent ) continue; printf( "%s ", p_module->psz_object_name ); } @@ -415,11 +415,13 @@ void PrintOption( char *psz_option, char i_short, char *psz_exclusive, { while( (foo = strchr( psz_text, ':' ))) *foo=';'; while( (foo = strchr( psz_text, '"' ))) *foo='\''; + while( (foo = strchr( psz_text, '`' ))) *foo='\''; } if( psz_longtext ) { while( (foo = strchr( psz_longtext, ':' ))) *foo=';'; while( (foo = strchr( psz_longtext, '"' ))) *foo='\''; + while( (foo = strchr( psz_longtext, '`' ))) *foo='\''; } if( !psz_longtext || strchr( psz_longtext, '\n' ) || diff --git a/extras/analyser/zsh_completion.sh b/extras/analyser/zsh_completion.sh index f10f4bf..77923ba 100755 --- a/extras/analyser/zsh_completion.sh +++ b/extras/analyser/zsh_completion.sh @@ -61,7 +61,7 @@ fi [ -z "$CXX" ] && CXX=g++ -ZSH_BUILD="$CXX $CXXFLAGS -D__LIBVLC__ -DHAVE_CONFIG_H -I$BUILDDIR -I$BUILDDIR/include -I../../include zsh.cpp $LIBVLC $LIBVLCCORE -o zsh_gen" +ZSH_BUILD="$CXX $CXXFLAGS -DHAVE_CONFIG_H -I$BUILDDIR -I$BUILDDIR/include -I../../include zsh.cpp $LIBVLC $LIBVLCCORE -o zsh_gen" echo $ZSH_BUILD echo _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
