From be189fda0d7c8db8cd8bc881d272aac3c9b835e6 Mon Sep 17 00:00:00 2001
From: Francesco Abbate <francesco.bbt@gmail.com>
Date: Fri, 4 Dec 2020 12:01:49 +0100
Subject: [PATCH] Always use HOME based user's config independently from
 portable option

---
 src/main.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main.c b/src/main.c
index ba113d75..1704a6f1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -125,21 +125,22 @@ int main(int argc, char **argv) {
     "  EXEDIR = EXEFILE:match(\"^(.+)[/\\\\].*$\")\n"
 #ifdef LITE_XL_DATA_USE_EXEDIR
     "  DATADIR = EXEDIR .. '/data'\n"
-    "  USERDIR = EXEDIR .. '/user'\n"
 #else
     "  do\n"
     "    local prefix = EXEDIR:match(\"^(.+)[/\\\\]bin$\")\n"
+    "    DATADIR = prefix and (prefix .. '/share/lite-xl') or (EXEDIR .. '/data')\n"
+    "  end\n"
+#endif
+    "  do\n"
 #ifdef _WIN32
     "    local home = os.getenv('USERPROFILE')\n"
 #else
     "    local home = os.getenv('HOME')\n"
 #endif
-    "    DATADIR = prefix and (prefix .. '/share/lite-xl') or (EXEDIR .. '/data')\n"
     "    USERDIR = home and (home .. '/.config/lite-xl') or (EXEDIR .. '/user')\n"
     "  end\n"
     "  package.path = package.path .. ';' .. USERDIR .. '/?.lua'\n"
     "  package.path = package.path .. ';' .. USERDIR .. '/?/init.lua'\n"
-#endif
     "  package.path = DATADIR .. '/?.lua;' .. package.path\n"
     "  package.path = DATADIR .. '/?/init.lua;' .. package.path\n"
     "  core = require('core')\n"