To: vim_dev@googlegroups.com
Subject: Patch 8.2.3155
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.3155
Problem:    Some option related code not covered by tests.
Solution:   Add a few test cases. (Dominique Pellé, closes #8552)
Files:      src/testdir/test_options.vim, src/testdir/test_set.vim


*** ../vim-8.2.3154/src/testdir/test_options.vim	2021-06-27 12:07:12.444471041 +0200
--- src/testdir/test_options.vim	2021-07-12 21:41:12.438037307 +0200
***************
*** 933,938 ****
--- 933,960 ----
    set autoread&
  endfunc
  
+ func Test_set_in_sandbox()
+   " Some boolean options cannot be set in sandbox, some can.
+   call assert_fails('sandbox set modelineexpr', 'E48:')
+   sandbox set number
+   call assert_true(&number)
+   set number&
+ 
+   " Some boolean options cannot be set in sandbox, some can.
+   if has('python') || has('python3')
+     call assert_fails('sandbox set pyxversion=3', 'E48:')
+   endif
+   sandbox set tabstop=4
+   call assert_equal(4, &tabstop)
+   set tabstop&
+ 
+   " Some string options cannot be set in sandbox, some can.
+   call assert_fails('sandbox set backupdir=/tmp', 'E48:')
+   sandbox set filetype=perl
+   call assert_equal('perl', &filetype)
+   set filetype&
+ endfunc
+ 
  " Test for incrementing, decrementing and multiplying a number option value
  func Test_opt_num_op()
    set shiftwidth=4
***************
*** 1149,1152 ****
--- 1171,1196 ----
    set noerrorbells
  endfunc
  
+ func Test_opt_scrolljump()
+   help
+   resize 10
+ 
+   " Test with positive 'scrolljump'.
+   set scrolljump=2
+   norm! Lj
+   call assert_equal({'lnum':11, 'leftcol':0, 'col':0, 'topfill':0,
+         \            'topline':3, 'coladd':0, 'skipcol':0, 'curswant':0},
+         \           winsaveview())
+ 
+   " Test with negative 'scrolljump' (percentage of window height).
+   set scrolljump=-40
+   norm! ggLj
+   call assert_equal({'lnum':11, 'leftcol':0, 'col':0, 'topfill':0,
+          \            'topline':5, 'coladd':0, 'skipcol':0, 'curswant':0},
+          \           winsaveview())
+ 
+   set scrolljump&
+   bw
+ endfunc
+ 
  " vim: shiftwidth=2 sts=2 expandtab
*** ../vim-8.2.3154/src/testdir/test_set.vim	2020-08-12 18:50:31.887655765 +0200
--- src/testdir/test_set.vim	2021-07-12 21:41:12.438037307 +0200
***************
*** 26,29 ****
--- 26,48 ----
    let &wig = wig_save
  endfunction
  
+ 
+ " :set, :setlocal, :setglobal without arguments show values of options.
+ func Test_set_no_arg()
+   set textwidth=79
+   let a = execute('set')
+   call assert_match("^\n--- Options ---\n.*textwidth=79\\>", a)
+   set textwidth&
+ 
+   setlocal textwidth=78
+   let a = execute('setlocal')
+   call assert_match("^\n--- Local option values ---\n.*textwidth=78\\>", a)
+   setlocal textwidth&
+ 
+   setglobal textwidth=77
+   let a = execute('setglobal')
+   call assert_match("^\n--- Global option values ---\n.*textwidth=77\\>", a)
+   setglobal textwidth&
+ endfunc
+ 
  " vim: shiftwidth=2 sts=2 expandtab
*** ../vim-8.2.3154/src/version.c	2021-07-11 22:04:22.579750547 +0200
--- src/version.c	2021-07-12 21:43:03.985893911 +0200
***************
*** 757,758 ****
--- 757,760 ----
  {   /* Add new patch number below this line */
+ /**/
+     3155,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
128. You can access the Net -- via your portable and cellular phone.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///