diff options
| author |  Siteshwar Vashisht <siteshwar@gmail.com> | 2012-01-31 00:04:15 +0530 |
|---|---|---|
| committer | Siteshwar Vashisht <siteshwar@gmail.com> | 2012-01-31 00:04:15 +0530 |
| commit | 48408b0a0bf16dcb8cfca7bffc1502677e094a93 (patch) | |
| tree | ee9f020b1d01569784bc3cd3f3d5a7cc244b56ec /highlight.cpp | |
| parent | cd7d1f2bfe3aefbc85e657a6bbddeac39730612a (diff) | |
| parent | ed66a46113d82bd570ee4ec908a29d1918969036 (diff) | |
Merge branch 'CPlusPlus' of gitorious.org:~ridiculousfish/fish-shell/fishfish into CPlusPlus
Diffstat (limited to 'highlight.cpp')
| -rw-r--r-- | highlight.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/highlight.cpp b/highlight.cpp index 3945dc2a..45632883 100644 --- a/highlight.cpp +++ b/highlight.cpp @@ -151,7 +151,7 @@ static bool is_potential_path( const wcstring &cpath ) wcstring ent; while (wreaddir(dir, ent)) { - if( wcsncmp( base_name.c_str(), base_name.c_str(), base_name.length() ) == 0 ) + if( wcsncmp( ent.c_str(), base_name.c_str(), base_name.length() ) == 0 ) { res = true; break; @@ -646,7 +646,7 @@ void tokenize( const wchar_t * const buff, int * const color, const int pos, arr int mark = tok_get_pos( &tok ); color[ tok_get_pos( &tok ) ] = HIGHLIGHT_COMMAND; - if( parser_keywords_is_subcommand( cmd.c_str() ) ) + if( parser_keywords_is_subcommand( cmd ) ) { int sw; @@ -668,7 +668,7 @@ void tokenize( const wchar_t * const buff, int * const color, const int pos, arr sw = parser_keywords_is_switch( tok_last( &tok ) ); - if( !parser_keywords_is_block( cmd.c_str() ) && + if( !parser_keywords_is_block( cmd ) && sw == ARG_SWITCH ) { /* |