debugging

2 files changed, 16 insertions, 5 deletions

diff --git a/buffer.c b/buffer.c
index bdba7ff..d1ccb11 100644
--- a/buffer.c
+++ b/buffer.c
@@ -578,7 +578,7 @@ static Status buffer_line_set_len(TextBuffer *buffer, Line *line, u32 new_len) {
 				line->str = new_str;
 			}
 		}
-	} else if (line->len == 0 && new_len > 0) {
+	} else if (!line->str) {
 		// start by allocating 8 code points
 		line->str = buffer_malloc(buffer, 8 * sizeof *line->str);
 		if (!line->str) {
@@ -1811,7 +1811,7 @@ void buffer_copy_or_cut(TextBuffer *buffer, bool cut) {
 			int err = SDL_SetClipboardText(text);
 			free(text);
 			if (err < 0) {
-				buffer_seterr(buffer, "Couldn't get clipboard contents: %s", SDL_GetError());
+				buffer_seterr(buffer, "Couldn't set clipboard contents: %s", SDL_GetError());
 			} else {
 				// text copied successfully
 				if (cut) {
diff --git a/main.c b/main.c
index 7c5a672..dc30eeb 100644
--- a/main.c
+++ b/main.c
@@ -1,5 +1,7 @@
 // @TODO:
-// - test on BSD
+// - more instructions (basic stuff + how to open config)
+// - update screenshot in README
+// - test windows 7
 
 // - completion
 
@@ -265,6 +267,7 @@ INT WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
 #else
 int main(int argc, char **argv) {
 #endif
+	PROFILE_TIME(init_start)
 	
 #if __unix__
 	{
@@ -285,6 +288,8 @@ int main(int argc, char **argv) {
 	
 	setlocale(LC_ALL, ""); // allow unicode
 
+	printf("%p\n",ted); // @TODO: delete me
+
 	// read command-line arguments
 	char const *starting_filename = NULL;
 	switch (argc) {
@@ -407,10 +412,9 @@ int main(int argc, char **argv) {
 				die("ted's backup config file, %s, does not exist. Try reinstalling ted?", global_config_filename);
 			}
 		}
+		config_read(ted, global_config_filename);
 		config_read(ted, local_config_filename);
 		if (ted_haserr(ted)) {
-			// if there's an error in the local config, read the global config to make sure everything's ok
-			config_read(ted, global_config_filename);
 			strcpy(config_err, ted->error);
 			ted_clearerr(ted); // clear the error so later things (e.g. loading font) don't detect an error
 		}
@@ -477,7 +481,14 @@ int main(int argc, char **argv) {
 	text_init();
 	
 	SDL_GL_SetSwapInterval(1); // vsync
+	PROFILE_TIME(fonts_start)
 	ted_load_fonts(ted);
+	PROFILE_TIME(fonts_end)
+	
+#if PROFILE
+	
+#endif
+	
 	if (ted_haserr(ted))
 		die("Error loading font: %s", ted_geterr(ted));
 	{