From f663243e95f488b8f4224bdae2697ddac21d0ffb Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 22 Oct 2024 09:05:14 +0800
Subject: vim-patch:9.1.0797: testing of options can be further improved
 (#30893)

Problem:  testing of options can be further improved
Solution: split the generated option test into test_options_all.vim,
          add more test cases, save and restore values, fix use-after-free

closes: vim/vim#15894

https://github.com/vim/vim/commit/6eca04e9f1d446dc509ba51e32da56fa413fe2f0

Co-authored-by: Milly <milly.ca@gmail.com>
---
 src/nvim/main.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/nvim/main.c b/src/nvim/main.c
index 436c3ccc7a..695bd4c95a 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -777,7 +777,11 @@ void getout(int exitval)
     }
   }
 
-  if (p_shada && *p_shada != NUL) {
+  if (
+#ifdef EXITFREE
+      !entered_free_all_mem &&
+#endif
+      p_shada && *p_shada != NUL) {
     // Write out the registers, history, marks etc, to the ShaDa file
     shada_write_file(NULL, false);
   }
-- 
cgit