a4.0.5 - ready to go

master
Allen Webster 2016-05-16 16:30:19 -04:00
parent 1d9b327b96
commit cc91b72883
2 changed files with 41 additions and 31 deletions

View File

@ -4041,6 +4041,11 @@ App_Step_Sig(app_step){
"and if you load README.txt you'll find all the key combos there are.\n" "and if you load README.txt you'll find all the key combos there are.\n"
"\n" "\n"
"Newest features:\n" "Newest features:\n"
"-New indent rule\n"
"-app->buffer_compute_cursor in the customization API\n"
"-f keys are available\n"
"\n"
"New in alpha 4.0.3 and 4.0.4\n"
"-Scroll bar on files and file lists\n" "-Scroll bar on files and file lists\n"
"-Arrow navigation in lists\n" "-Arrow navigation in lists\n"
"-A new minimal theme editor\n" "-A new minimal theme editor\n"

View File

@ -2256,6 +2256,10 @@ internal Cpp_Token*
seek_matching_token_backwards(Cpp_Token_Stack tokens, Cpp_Token *token, seek_matching_token_backwards(Cpp_Token_Stack tokens, Cpp_Token *token,
Cpp_Token_Type open_type, Cpp_Token_Type close_type){ Cpp_Token_Type open_type, Cpp_Token_Type close_type){
int nesting_level = 0; int nesting_level = 0;
if (token <= tokens.tokens){
token = tokens.tokens;
}
else{
for (; token > tokens.tokens; --token){ for (; token > tokens.tokens; --token){
if (!(token->flags & CPP_TFLAG_PP_BODY)){ if (!(token->flags & CPP_TFLAG_PP_BODY)){
if (token->type == close_type){ if (token->type == close_type){
@ -2271,6 +2275,7 @@ seek_matching_token_backwards(Cpp_Token_Stack tokens, Cpp_Token *token,
} }
} }
} }
}
return(token); return(token);
} }
@ -2392,7 +2397,7 @@ get_line_indentation_marks(Partition *part, Buffer *buffer, Cpp_Token_Stack toke
else{ else{
int close = 0; int close = 0;
for (token = start_token; token < brace_token; ++token){ for (token = brace_token; token >= start_token; --token){
switch(token->type){ switch(token->type){
case CPP_TOKEN_PARENTHESE_CLOSE: case CPP_TOKEN_PARENTHESE_CLOSE:
case CPP_TOKEN_BRACKET_CLOSE: case CPP_TOKEN_BRACKET_CLOSE: