aboutsummaryrefslogtreecommitdiff
path: root/tools/editor/code_editor.cpp
diff options
context:
space:
mode:
authorKostadin Damyanov2016-01-15 22:43:54 +0200
committerKostadin Damyanov2016-01-15 22:43:54 +0200
commit7998197ff17892a8127aa2fe53d13937763dee87 (patch)
tree53c97bf9907a3225776340273e773a4d904cbb73 /tools/editor/code_editor.cpp
parent62574759ab16043b70f2da6e160072c353ba4148 (diff)
parent3c6dd5749d445f082fc925a34cc0a26f8d342304 (diff)
downloadgodot-7998197ff17892a8127aa2fe53d13937763dee87.tar.gz
godot-7998197ff17892a8127aa2fe53d13937763dee87.tar.zst
godot-7998197ff17892a8127aa2fe53d13937763dee87.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tools/editor/code_editor.cpp')
-rw-r--r--tools/editor/code_editor.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/editor/code_editor.cpp b/tools/editor/code_editor.cpp
index 0728b3b7c..fe863bfeb 100644
--- a/tools/editor/code_editor.cpp
+++ b/tools/editor/code_editor.cpp
@@ -5,7 +5,7 @@
/* GODOT ENGINE */
/* http://www.godotengine.org */
/*************************************************************************/
-/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur. */
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
@@ -612,6 +612,7 @@ CodeTextEditor::CodeTextEditor() {
if (!font_overrode)
text_editor->add_font_override("font",get_font("source","Fonts"));
+
text_editor->set_show_line_numbers(true);
text_editor->set_brace_matching(true);
text_editor->set_auto_indent(true);