From cc91b72883a933b47b6972136083426cc0453e73 Mon Sep 17 00:00:00 2001
From: Allen Webster <editor@4coder.net>
Date: Mon, 16 May 2016 16:30:19 -0400
Subject: [PATCH] a4.0.5 - ready to go

---
 4ed.cpp           | 43 ++++++++++++++++++++++++-------------------
 4ed_file_view.cpp | 29 +++++++++++++++++------------
 2 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/4ed.cpp b/4ed.cpp
index 1855e5b3..b8fa736b 100644
--- a/4ed.cpp
+++ b/4ed.cpp
@@ -4031,28 +4031,33 @@ App_Step_Sig(app_step){
     }
 
     update_command_data(vars, cmd);
-    
+
     // NOTE(allen): initialize message
     if (first_step){
         String welcome = make_lit_string(
-            "Welcome to " VERSION "\n"
-                "If you're new to 4coder there's no tutorial yet :(\n"
-                "you can use the key combo control + o to look for a file\n"
-                "and if you load README.txt you'll find all the key combos there are.\n"
-                "\n"
-                "Newest features:\n"
-                "-Scroll bar on files and file lists\n"
-                "-Arrow navigation in lists\n"
-                "-A new minimal theme editor\n"
-                "\n"
-                "New in alpha 4.0.2:\n"
-                "-The file count limit is over 8 million now\n"
-                "-File equality is handled better so renamings (such as 'subst') are safe now\n"
-                "-This buffer will report events including errors that happen in 4coder\n"
-                "-Super users can post their own messages here with app->print_message\n"
-                "-<ctrl e> centers view on cursor; cmdid_center_view in customization API\n"
-                "-Set font size on command line with -f N, N = 16 by default\n\n"
-        );
+                                         "Welcome to " VERSION "\n"
+                                         "If you're new to 4coder there's no tutorial yet :(\n"
+                                         "you can use the key combo control + o to look for a file\n"
+                                         "and if you load README.txt you'll find all the key combos there are.\n"
+                                         "\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"
+                                         "-Arrow navigation in lists\n"
+                                         "-A new minimal theme editor\n"
+                                         "\n"
+                                         "New in alpha 4.0.2:\n"
+                                         "-The file count limit is over 8 million now\n"
+                                         "-File equality is handled better so renamings (such as 'subst') are safe now\n"
+                                         "-This buffer will report events including errors that happen in 4coder\n"
+                                         "-Super users can post their own messages here with app->print_message\n"
+                                         "-<ctrl e> centers view on cursor; cmdid_center_view in customization API\n"
+                                         "-Set font size on command line with -f N, N = 16 by default\n\n"
+                                         );
 
         do_feedback_message(system, models, welcome);
     }
diff --git a/4ed_file_view.cpp b/4ed_file_view.cpp
index 9b296059..be5383f4 100644
--- a/4ed_file_view.cpp
+++ b/4ed_file_view.cpp
@@ -2256,17 +2256,22 @@ internal Cpp_Token*
 seek_matching_token_backwards(Cpp_Token_Stack tokens, Cpp_Token *token,
     Cpp_Token_Type open_type, Cpp_Token_Type close_type){
     int nesting_level = 0;
-    for (; token > tokens.tokens; --token){
-        if (!(token->flags & CPP_TFLAG_PP_BODY)){
-            if (token->type == close_type){
-                ++nesting_level;
-            }
-            else if (token->type == open_type){
-                if (nesting_level == 0){
-                    break;
+    if (token <= tokens.tokens){
+        token = tokens.tokens;
+    }
+    else{
+        for (; token > tokens.tokens; --token){
+            if (!(token->flags & CPP_TFLAG_PP_BODY)){
+                if (token->type == close_type){
+                    ++nesting_level;
                 }
-                else{
-                    --nesting_level;
+                else if (token->type == open_type){
+                    if (nesting_level == 0){
+                        break;
+                    }
+                    else{
+                        --nesting_level;
+                    }
                 }
             }
         }
@@ -2392,7 +2397,7 @@ get_line_indentation_marks(Partition *part, Buffer *buffer, Cpp_Token_Stack toke
         else{
             int close = 0;
 
-            for (token = start_token; token < brace_token; ++token){
+            for (token = brace_token; token >= start_token; --token){
                 switch(token->type){
                     case CPP_TOKEN_PARENTHESE_CLOSE:
                     case CPP_TOKEN_BRACKET_CLOSE:
@@ -2402,7 +2407,7 @@ get_line_indentation_marks(Partition *part, Buffer *buffer, Cpp_Token_Stack toke
                 }
             }
             out_of_loop2:;
-
+            
             switch (close){
                 case 0: token = start_token; found_safe_start_position = 1; break;