From 89b6fe663dbdf8a5498fc2ec4cba62aae3401dde Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Fri, 15 Jul 2016 19:34:32 -0400 Subject: [PATCH] little fix for the basic 4coder --- 4coder_default_bindings.cpp | 2 ++ 4coder_jump_parsing.cpp | 3 +++ 4ed.cpp | 4 ---- build.bat | 3 ++- build_all.bat | 4 ++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/4coder_default_bindings.cpp b/4coder_default_bindings.cpp index 5bc129b1..f8ee8e1a 100644 --- a/4coder_default_bindings.cpp +++ b/4coder_default_bindings.cpp @@ -398,6 +398,8 @@ default_keys(Bind_Helper *context){ #ifndef NO_BINDING + + extern "C" int get_bindings(void *data, int size){ Bind_Helper context_ = begin_bind_helper(data, size); diff --git a/4coder_jump_parsing.cpp b/4coder_jump_parsing.cpp index fe280333..376e6e71 100644 --- a/4coder_jump_parsing.cpp +++ b/4coder_jump_parsing.cpp @@ -31,6 +31,9 @@ ms_style_verify(String line, int paren_pos){ if (match_part(line_part, ") : ")){ result = true; } + else if (match_part(line_part, "): ")){ + result = true; + } return(result); } diff --git a/4ed.cpp b/4ed.cpp index cca7db8a..600d5630 100644 --- a/4ed.cpp +++ b/4ed.cpp @@ -1527,10 +1527,6 @@ App_Init_Sig(app_init){ if (!did_top) setup_top_commands(&models->map_top, &models->mem.part, global); if (!did_file) setup_file_commands(&models->map_file, &models->mem.part, global); -#ifndef FRED_SUPER - models->hooks[hook_start] = 0; -#endif - setup_ui_commands(&models->map_ui, &models->mem.part, global); } diff --git a/build.bat b/build.bat index 93eb7560..8f9a1dcd 100644 --- a/build.bat +++ b/build.bat @@ -1,5 +1,6 @@ @echo off REM "build_exp.bat" /Zi -"build_all.bat" /DFRED_SUPER /DFRED_INTERNAL /Zi +REM "build_all.bat" /DFRED_SUPER /DFRED_INTERNAL /Zi +"build_all.bat" /DFRED_INTERNAL /Zi REM "build_all.bat" /O2 /Zi diff --git a/build_all.bat b/build_all.bat index 046bc517..f0cc8bbb 100644 --- a/build_all.bat +++ b/build_all.bat @@ -26,8 +26,8 @@ popd pushd ..\build REM call "%CODE_DIR%\buildsuper.bat" ..\code\4coder_default_bindings.cpp -REM call "%CODE_DIR%\buildsuper.bat" ..\code\power\4coder_experiments.cpp -call "%CODE_DIR%\buildsuper.bat" ..\code\power\4coder_casey.cpp +call "%CODE_DIR%\buildsuper.bat" ..\code\power\4coder_experiments.cpp +REM call "%CODE_DIR%\buildsuper.bat" ..\code\power\4coder_casey.cpp REM call "%CODE_DIR%\buildsuper.bat" ..\4vim\4coder_chronal.cpp if %ERRORLEVEL% neq 0 (set FirstError=1)