From 0a8ee4bf0a80532408d44bd783993f98db3fff9f Mon Sep 17 00:00:00 2001 From: Albert Cervin Date: Wed, 28 Feb 2024 11:05:07 +0100 Subject: More lang and buffer fixes --- src/dged/buffer.c | 2 +- src/dged/lang.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/dged/buffer.c b/src/dged/buffer.c index df99ea9..bfa0010 100644 --- a/src/dged/buffer.c +++ b/src/dged/buffer.c @@ -683,7 +683,7 @@ struct location buffer_newline(struct buffer *buffer, struct location at) { struct location buffer_indent(struct buffer *buffer, struct location at) { struct setting *tw = lang_setting(&buffer->lang, "tab-width"); if (tw == NULL) { - tw = settings_get("tab-width"); + tw = settings_get("editor.tab-width"); } uint32_t tab_width = 4; diff --git a/src/dged/lang.c b/src/dged/lang.c index dc0afc3..c0b7462 100644 --- a/src/dged/lang.c +++ b/src/dged/lang.c @@ -43,16 +43,20 @@ void languages_init(bool register_default) { define_lang("Nix", "nix", "^.*\\.nix$", 2); define_lang("Make", "make", "^.*(Makefile|\\.mk)$", 4); define_lang("Python", "python", "^.*\\.py$", 4); - define_lang("Git Commit Message", "gitcommit", "^COMMIT_EDITMSG$", 4); + define_lang("Git Commit Message", "gitcommit", "^.*COMMIT_EDITMSG$", 4); } } void lang_destroy(struct language *lang) { - if (strlen(lang->id) != 3 || memcmp(lang->id, "fnd", 3) != 0) { + if (!lang_is_fundamental(lang)) { free((void *)lang->id); } } +bool lang_is_fundamental(const struct language *lang) { + return strlen(lang->id) == 3 && memcmp(lang->id, "fnd", 3) == 0; +} + static struct language lang_from_settings(const char *id) { struct setting *name = _lang_setting(id, "name"); const char *name_value = name != NULL ? name->value.string_value : "Unknown"; -- cgit v1.2.3