summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Buffer.zig8
-rw-r--r--src/Config.zig7
2 files changed, 10 insertions, 5 deletions
diff --git a/src/Buffer.zig b/src/Buffer.zig
index d7f051d..cb89935 100644
--- a/src/Buffer.zig
+++ b/src/Buffer.zig
@@ -1,4 +1,4 @@
1const es_config = @import("es-config"); 1const conf = @import("es-config");
2const std = @import("std"); 2const std = @import("std");
3 3
4const Allocator = std.mem.Allocator; 4const Allocator = std.mem.Allocator;
@@ -193,7 +193,11 @@ pub fn drawRows(self: Buffer, writer: anytype, screenrows: usize, screencols: us
193 } 193 }
194 } 194 }
195 } else if (self.rows.items.len == 0 and y == screenrows / 3) { 195 } else if (self.rows.items.len == 0 and y == screenrows / 3) {
196 const welcome_data = try std.fmt.allocPrint(self.allocator, "ES -- version {}", .{es_config.es_version}); 196 const welcome_data = try std.fmt.allocPrint(
197 self.allocator,
198 "ES -- version {}",
199 .{conf.es_version},
200 );
197 defer self.allocator.free(welcome_data); 201 defer self.allocator.free(welcome_data);
198 var welcome = welcome_data; 202 var welcome = welcome_data;
199 if (welcome.len > screencols - 1) { 203 if (welcome.len > screencols - 1) {
diff --git a/src/Config.zig b/src/Config.zig
index 1f11b65..900c2aa 100644
--- a/src/Config.zig
+++ b/src/Config.zig
@@ -1,5 +1,6 @@
1// TODO: Change this to proper TOML in the future :) 1// TODO: Change this to proper TOML in the future :)
2 2
3const conf = @import("es-config");
3const std = @import("std"); 4const std = @import("std");
4 5
5const Allocator = std.mem.Allocator; 6const Allocator = std.mem.Allocator;
@@ -8,9 +9,9 @@ const Config = @This();
8 9
9const config_path = "arkta/es/es.ini"; 10const config_path = "arkta/es/es.ini";
10 11
11line_limit: usize = 100, 12line_limit: usize = conf.default_line_limit,
12page_overlap: usize = 2, 13page_overlap: usize = conf.default_page_overlap,
13tab_stop: usize = 8, 14tab_stop: usize = conf.default_tab_stop,
14 15
15pub fn readConfig(allocator: Allocator) !Config { 16pub fn readConfig(allocator: Allocator) !Config {
16 var config = Config{}; 17 var config = Config{};