From 9ab9cde2ca7b917a894068698ef2fec3a851fdd5 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sat, 3 Feb 2024 10:22:11 +0800 Subject: vim-patch:partial:9.0.1196: code is indented more than necessary (#27315) Problem: Code is indented more than necessary. Solution: Use an early return where it makes sense. (Yegappan Lakshmanan, closes vim/vim#11813) https://github.com/vim/vim/commit/e8575988969579f9e1439181ae338b2ff74054a8 Skip list_alloc_with_items(). Co-authored-by: Yegappan Lakshmanan --- src/nvim/os/lang.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'src/nvim/os') diff --git a/src/nvim/os/lang.c b/src/nvim/os/lang.c index f1e23fa543..fb534ab2f4 100644 --- a/src/nvim/os/lang.c +++ b/src/nvim/os/lang.c @@ -80,17 +80,21 @@ static char *get_mess_env(void) return get_locale_val(LC_MESSAGES); #else char *p = (char *)os_getenv("LC_ALL"); + if (p != NULL) { + return p; + } + + p = (char *)os_getenv("LC_MESSAGES"); + if (p != NULL) { + return p; + } + + p = (char *)os_getenv("LANG"); + if (p != NULL && ascii_isdigit(*p)) { + p = NULL; // ignore something like "1043" + } if (p == NULL) { - p = (char *)os_getenv("LC_MESSAGES"); - if (p == NULL) { - p = (char *)os_getenv("LANG"); - if (p != NULL && ascii_isdigit(*p)) { - p = NULL; // ignore something like "1043" - } - if (p == NULL) { - p = get_locale_val(LC_CTYPE); - } - } + p = get_locale_val(LC_CTYPE); } return p; #endif -- cgit