diff --git a/4ed_api_implementation.cpp b/4ed_api_implementation.cpp index e3de6306..917d9377 100644 --- a/4ed_api_implementation.cpp +++ b/4ed_api_implementation.cpp @@ -1269,14 +1269,19 @@ DOC_SEE(Set_Buffer_Flag) return(result); } -VIEW_POST_FADE_SIG(external_view_post_fade){ +VIEW_POST_FADE_SIG(external_view_post_fade)/* +DOC_PARAM(view, the veiw to post a fade effect to) +DOC_PARAM(seconds, the number of seconds the fade effect should last) +DOC_PARAM(start, the first character in the fade range) +DOC_PARAM(end, one after the last character in the fade range) +DOC_PARAM(color, the color to fade from) +*/{ Command_Data *cmd = (Command_Data*)app->cmd_context; View *vptr = imp_get_view(cmd, view); int result = false; int size = end - start; - if (vptr){ if (size > 0){ result = true; diff --git a/4ed_file_view.cpp b/4ed_file_view.cpp index 67542211..b686c3af 100644 --- a/4ed_file_view.cpp +++ b/4ed_file_view.cpp @@ -3288,9 +3288,11 @@ kill_file(System_Functions *system, Models *models, } } -internal void +internal b32 try_kill_file(System_Functions *system, Models *models, Editing_File *file, View *view, String string){ + + b32 kill_dialogue = false; Working_Set *working_set = &models->working_set; if (!file && string.str){ @@ -3309,11 +3311,14 @@ try_kill_file(System_Functions *system, Models *models, IAct_Sure_To_Kill, IInt_Sure_To_Kill, make_lit_string("Are you sure?")); copy(&view->dest, file->name.live_name); + kill_dialogue = true; } else{ kill_file(system, models, file, string_zero()); } } + + return(kill_dialogue); } internal void @@ -3358,8 +3363,9 @@ interactive_view_complete(System_Functions *system, View *view, String dest, i32 break; case IAct_Kill: - try_kill_file(system, models, 0, 0, dest); - view_show_file(view); + if (!try_kill_file(system, models, 0, 0, dest)){ + view_show_file(view); + } break; case IAct_Sure_To_Close: diff --git a/build_all.bat b/build_all.bat index 7263be26..b5a59566 100644 --- a/build_all.bat +++ b/build_all.bat @@ -23,7 +23,7 @@ popd pushd ..\build REM call "..\code\buildsuper.bat" ..\code\4coder_default_bindings.cpp -REM call "..\code\buildsuper.bat" ..\code\power\4coder_experiments.cpp +call "..\code\buildsuper.bat" ..\code\power\4coder_experiments.cpp REM call "..\code\buildsuper.bat" ..\code\power\4coder_casey.cpp REM call "..\code\buildsuper.bat" ..\4vim\4coder_chronal.cpp if %ERRORLEVEL% neq 0 (set FirstError=1)