fix: Some merge issues

WerWolv · Sep 15, 2024 · b3a0ebe · b3a0ebe
1 parent 96a588b
commit b3a0ebe
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -37,8 +37,8 @@ include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake")
 # Setup project
 loadVersion(IMHEX_VERSION IMHEX_VERSION_PLAIN)
 setVariableInParent(IMHEX_VERSION ${IMHEX_VERSION})
-configureCMake()
 
+configureCMake()
 project(imhex
         LANGUAGES       C CXX
         VERSION         ${IMHEX_VERSION_PLAIN}

diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
@@ -307,9 +307,6 @@ endfunction()
 macro(configureCMake)
     message(STATUS "Configuring ImHex v${IMHEX_VERSION}")
 
-    # Enable C and C++ languages
-    enable_language(C CXX)
-
     set(CMAKE_POSITION_INDEPENDENT_CODE ON CACHE BOOL "Enable position independent code for all targets" FORCE)
 
     # Configure use of recommended build tools

diff --git a/lib/third_party/imgui/ColorTextEditor/source/TextEditor.cpp b/lib/third_party/imgui/ColorTextEditor/source/TextEditor.cpp
@@ -392,14 +392,6 @@ TextEditor::Coordinates TextEditor::FindWordEnd(const Coordinates &aFrom) const
     while (cindex < (line.size()) && !isWordChar(line[cindex].mChar))
         ++cindex;
 
-    if (prevspace != !!isspace(c)) {
-        if (isspace(c))
-            while (cindex < (int)line.size() && isspace(line[cindex].mChar))
-                ++cindex;
-        break;
-    }
-    cindex += d;
-
     if (line[cindex-1].mChar == '\"')
         --cindex;
     return Coordinates(aFrom.mLine, GetCharacterColumn(aFrom.mLine, cindex));