Merge #8411 from justinmk/vimpatches

src/nvim/option.c

@@ -913,27 +913,24 @@ void set_number_default(char *name, long val)
 }
 
 #if defined(EXITFREE)
-/*
+/// Free all options.
- * Free all options.
- */
 void free_all_options(void)
 {
-  int i;
+  for (int i = 0; options[i].fullname; i++) {
-
-  for (i = 0; options[i].fullname; i++) {
     if (options[i].indir == PV_NONE) {
-      /* global option: free value and default value. */
+      // global option: free value and default value.
-      if (options[i].flags & P_ALLOCED && options[i].var != NULL)
+      if ((options[i].flags & P_ALLOCED) && options[i].var != NULL) {
-        free_string_option(*(char_u **)options[i].var);
-      if (options[i].flags & P_DEF_ALLOCED)
-        free_string_option(options[i].def_val[VI_DEFAULT]);
-    } else if (options[i].var != VAR_WIN
-               && (options[i].flags & P_STRING))
-      /* buffer-local option: free global value */
         free_string_option(*(char_u **)options[i].var);
       }
+      if (options[i].flags & P_DEF_ALLOCED) {
+        free_string_option(options[i].def_val[VI_DEFAULT]);
+      }
+    } else if (options[i].var != VAR_WIN && (options[i].flags & P_STRING)) {
+      // buffer-local option: free global value
+      free_string_option(*(char_u **)options[i].var);
+    }
+  }
 }
-
 #endif
 
 

src/nvim/testdir/test_assign.vim

@@ -3,7 +3,31 @@
 func Test_no_type_checking()
   let v = 1
   let v = [1,2,3]
-  let v = {'a':1, 'b':2}
+  let v = {'a': 1, 'b': 2}
   let v = 3.4
   let v = 'hello'
 endfunc
+
+func Test_let_termcap()
+  " Nvim does not support `:set termcap`.
+  return
+  " Terminal code
+  let old_t_te = &t_te
+  let &t_te = "\<Esc>[yes;"
+  call assert_match('t_te.*^[[yes;', execute("set termcap"))
+  let &t_te = old_t_te
+
+  if exists("+t_k1")
+    " Key code
+    let old_t_k1 = &t_k1
+    let &t_k1 = "that"
+    call assert_match('t_k1.*that', execute("set termcap"))
+    let &t_k1 = old_t_k1
+  endif
+
+  call assert_fails('let x = &t_xx', 'E15')
+  let &t_xx = "yes"
+  call assert_equal("yes", &t_xx)
+  let &t_xx = ""
+  call assert_fails('let x = &t_xx', 'E15')
+endfunc

src/nvim/testdir/test_options.vim

@@ -227,6 +227,38 @@ func Test_set_errors()
   call assert_fails('set t_foo=', 'E846:')
 endfunc
 
+func Test_set_ttytype()
+  " Nvim does not support 'ttytype'.
+  if !has('nvim') && !has('gui_running') && has('unix')
+    " Setting 'ttytype' used to cause a double-free when exiting vim and
+    " when vim is compiled with -DEXITFREE.
+    set ttytype=ansi
+    call assert_equal('ansi', &ttytype)
+    call assert_equal(&ttytype, &term)
+    set ttytype=xterm
+    call assert_equal('xterm', &ttytype)
+    call assert_equal(&ttytype, &term)
+    " "set ttytype=" gives E522 instead of E529
+    " in travis on some builds. Why?  Catch both for now
+    try
+      set ttytype=
+      call assert_report('set ttype= did not fail')
+    catch /E529\|E522/
+    endtry
+
+    " Some systems accept any terminal name and return dumb settings,
+    " check for failure of finding the entry and for missing 'cm' entry.
+    try
+      set ttytype=xxx
+      call assert_report('set ttype=xxx did not fail')
+    catch /E522\|E437/
+    endtry
+
+    set ttytype&
+    call assert_equal(&ttytype, &term)
+  endif
+endfunc
+
 func Test_complete()
   " Trailing single backslash used to cause invalid memory access.
   set complete=s\