From e0e236edfc75cb4d9999d619edac3cec8e3ea323 Mon Sep 17 00:00:00 2001
From: VolTer <mew.pur.pur@abv.bg>
Date: Sun, 2 Oct 2022 13:59:49 +0200
Subject: [PATCH] Remove editor setting for hiding bookmarks

---
 doc/classes/EditorSettings.xml | 5 +----
 editor/code_editor.cpp         | 1 -
 editor/editor_settings.cpp     | 1 -
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/doc/classes/EditorSettings.xml b/doc/classes/EditorSettings.xml
index 799bd45ceed..eb05219cbb7 100644
--- a/doc/classes/EditorSettings.xml
+++ b/doc/classes/EditorSettings.xml
@@ -682,11 +682,8 @@
 		<member name="text_editor/appearance/gutters/line_numbers_zero_padded" type="bool" setter="" getter="">
 			If [code]true[/code], displays line numbers with zero padding (e.g. [code]007[/code] instead of [code]7[/code]).
 		</member>
-		<member name="text_editor/appearance/gutters/show_bookmark_gutter" type="bool" setter="" getter="">
-			If [code]true[/code], displays icons for bookmarks in a gutter at the left. Bookmarks remain functional when this setting is disabled.
-		</member>
 		<member name="text_editor/appearance/gutters/show_info_gutter" type="bool" setter="" getter="">
-			If [code]true[/code], displays a gutter at the left containing icons for methods with signal connections.
+			If [code]true[/code], displays a gutter at the left containing icons for methods with signal connections and for overridden methods.
 		</member>
 		<member name="text_editor/appearance/gutters/show_line_numbers" type="bool" setter="" getter="">
 			If [code]true[/code], displays line numbers in a gutter at the left.
diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp
index 212a46cb62b..7ec9558b269 100644
--- a/editor/code_editor.cpp
+++ b/editor/code_editor.cpp
@@ -1018,7 +1018,6 @@ void CodeTextEditor::update_editor_settings() {
 	// Appearance: Gutters
 	text_editor->set_draw_line_numbers(EDITOR_GET("text_editor/appearance/gutters/show_line_numbers"));
 	text_editor->set_line_numbers_zero_padded(EDITOR_GET("text_editor/appearance/gutters/line_numbers_zero_padded"));
-	text_editor->set_draw_bookmarks_gutter(EDITOR_GET("text_editor/appearance/gutters/show_bookmark_gutter"));
 
 	// Appearance: Minimap
 	text_editor->set_draw_minimap(EDITOR_GET("text_editor/appearance/minimap/show_minimap"));
diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp
index 409ef95fb01..9436043a236 100644
--- a/editor/editor_settings.cpp
+++ b/editor/editor_settings.cpp
@@ -526,7 +526,6 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	_initial_set("text_editor/appearance/gutters/show_line_numbers", true);
 	_initial_set("text_editor/appearance/gutters/line_numbers_zero_padded", false);
 	_initial_set("text_editor/appearance/gutters/highlight_type_safe_lines", true);
-	_initial_set("text_editor/appearance/gutters/show_bookmark_gutter", true);
 	_initial_set("text_editor/appearance/gutters/show_info_gutter", true);
 
 	// Appearance: Minimap