From 2794f396484bc8f1fb29190478c668cda22ce22d Mon Sep 17 00:00:00 2001 From: pommicket Date: Mon, 27 Mar 2023 16:40:54 -0400 Subject: fix crash on in/decrement-number & insert-text w no active buffer --- README.md | 1 + command.c | 16 ++++++++-------- control | 2 +- ted.h | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index abd58a2..97ddf56 100644 --- a/README.md +++ b/README.md @@ -315,6 +315,7 @@ Then, open windows\_installer\\ted\\ted.sln, and build. 2.0 LSP support and a bunch of other things. 2023 Jan 11 2.1 Better interaction between path+language specific settings, themes, and other things. 2023 Mar 7 2.2 Keyboard macros 2023 Mar 23 +2.2r1 Minor bug fixes 2023 Mar 27 ## License diff --git a/command.c b/command.c index ed42e87..5b3411b 100644 --- a/command.c +++ b/command.c @@ -179,13 +179,6 @@ void command_execute_ex(Ted *ted, Command c, CommandArgument full_argument, Comm case CMD_NOOP: break; - case CMD_INCREMENT_NUMBER: - buffer_change_number_at_cursor(buffer, argument); - break; - case CMD_DECREMENT_NUMBER: - buffer_change_number_at_cursor(buffer, -argument); - break; - case CMD_LEFT: if (buffer) buffer_cursor_move_left(buffer, argument); autocomplete_close(ted); @@ -302,7 +295,7 @@ void command_execute_ex(Ted *ted, Command c, CommandArgument full_argument, Comm case CMD_INSERT_TEXT: { const char *str = argument_str; - if (str) { + if (str && buffer) { buffer_insert_utf8_at_cursor(buffer, str); } } @@ -370,6 +363,13 @@ void command_execute_ex(Ted *ted, Command c, CommandArgument full_argument, Comm case CMD_DELETE_WORD: if (buffer) buffer_delete_words_at_cursor(buffer, argument); break; + case CMD_INCREMENT_NUMBER: + if (buffer) buffer_change_number_at_cursor(buffer, argument); + break; + case CMD_DECREMENT_NUMBER: + if (buffer) buffer_change_number_at_cursor(buffer, -argument); + break; + case CMD_PAGE_DOWN: if (buffer) buffer_page_down(buffer, argument); diff --git a/control b/control index 0eae890..07fac81 100644 --- a/control +++ b/control @@ -1,5 +1,5 @@ Package: ted -Version: 2.2 +Version: 2.2r1 Section: text Priority: optional Architecture: amd64 diff --git a/ted.h b/ted.h index b4f87ac..0852669 100644 --- a/ted.h +++ b/ted.h @@ -28,7 +28,7 @@ extern "C" { #include "sdl-inc.h" /// Version number -#define TED_VERSION "2.2" +#define TED_VERSION "2.2r1" /// Version string #define TED_VERSION_FULL "ted v. " TED_VERSION /// Maximum path size ted handles. -- cgit v1.2.3