From 4b02c3614971f9334514e3f37cc27686c6485e2b Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Tue, 31 Oct 2023 19:33:42 +0100 Subject: FLUID: Disables MergeBack. I decided to disable MergeBack for now. During testing, some issues could not be resolved, and focus should be on V1.4. --- fluid/Fl_Function_Type.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'fluid/Fl_Function_Type.cxx') diff --git a/fluid/Fl_Function_Type.cxx b/fluid/Fl_Function_Type.cxx index 33932cc93..3d45fb881 100644 --- a/fluid/Fl_Function_Type.cxx +++ b/fluid/Fl_Function_Type.cxx @@ -665,9 +665,9 @@ void Fl_Code_Type::write_code1(Fd_Code_Writer& f) { if ( handle_editor_changes() == 1 ) { main_window->redraw(); // tell fluid to redraw; edits may affect tree's contents } - f.tag(FD_TAG_GENERIC, 0); + // Matt: disabled f.tag(FD_TAG_GENERIC, 0); f.write_c_indented(name(), 0, '\n'); - f.tag(FD_TAG_CODE, get_uid()); + // Matt: disabled f.tag(FD_TAG_CODE, get_uid()); } /** -- cgit v1.2.3