Merge pull request #10 from edbee/master

Update to latest upstream for ctrl support on macos
Mudlet · Oct 10, 2024 · 46086e0 · 46086e0
2 parents dac0431 + f92ddf5
commit 46086e0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 edbee.lib:
 
+- PR #147, Add ctrl-a /  ctrl-e support for macOS
 - fix, Autocomplete Improvements
   - autocomplete is now really canceled with the escape key. It only appears again if the word becomes blank
   - add Qt::NoFocus focus policy to TextEditorAutocompleteComponent, to hopefully solve focus issue (https://github.com/Mudlet/Mudlet/issues/5310)

diff --git a/edbee-lib/edbee/data/factorykeymap.cpp b/edbee-lib/edbee/data/factorykeymap.cpp
@@ -25,7 +25,9 @@ void FactoryKeyMap::fill( TextEditorKeyMap* km )
     add( "goto_next_word", "move_to_next_word" );
     add( "goto_prev_word", "move_to_previous_word" );
     add( "goto_bol", "move_to_start_of_line" );
+    add( "goto_bol", "move_to_start_of_block");
     add( "goto_eol", "move_to_end_of_line" );
+    add( "goto_eol", "move_to_end_of_block");
     add( "goto_next_line", "move_to_next_line" );
     add( "goto_prev_line", "move_to_previous_line" );
     add( "goto_bof", "move_to_start_of_document" );

diff --git a/edbee-lib/edbee/util/mem/debug_allocs.cpp b/edbee-lib/edbee/util/mem/debug_allocs.cpp
@@ -33,7 +33,7 @@ DebugAllocationList::DebugAllocationList()
     , running_(false)
     , started_(false)
 {
-#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
     mutex_ = new EdbeeRecursiveMutex( QMutex::Recursive );
 #else
     mutex_ = new EdbeeRecursiveMutex();
@@ -65,7 +65,7 @@ void DebugAllocationList::clear()
 }
 
 
-/// Retuns the mutex for thread-safety
+/// Returns the mutex for thread-safety
 EdbeeRecursiveMutex* DebugAllocationList::mutex()
 {
     return mutex_;

diff --git a/edbee-lib/edbee/util/mem/debug_allocs.h b/edbee-lib/edbee/util/mem/debug_allocs.h
@@ -12,7 +12,7 @@
 
 
 
-#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
     #define EdbeeRecursiveMutex QMutex
 #else
     #define EdbeeRecursiveMutex QRecursiveMutex