To: vim_dev@googlegroups.com
Subject: Patch 8.2.3549
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.3549
Problem:    Mistakes in test comments.
Solution:   Fix the comments. (closes #9029)
Files:      src/testdir/test_autocmd.vim


*** ../vim-8.2.3548/src/testdir/test_autocmd.vim	2021-10-16 13:00:10.940165406 +0100
--- src/testdir/test_autocmd.vim	2021-10-21 10:49:14.899682391 +0100
***************
*** 760,792 ****
    call assert_equal(g:opt[0], g:opt[1])
  
  
!   " 19a: Setting string local-global (to buffer) option"
    let oldval = &tags
    let g:options = [['tags', oldval, oldval, oldval, 'tagpath', 'global', 'set']]
    set tags=tagpath
    call assert_equal([], g:options)
    call assert_equal(g:opt[0], g:opt[1])
  
!   " 19b: Resetting string local-global (to buffer) option"
    let g:options = [['tags', 'tagpath', 'tagpath', 'tagpath', oldval, 'global', 'set']]
    set tags&
    call assert_equal([], g:options)
    call assert_equal(g:opt[0], g:opt[1])
  
!   " 19c: Setting global string local-global (to buffer) option "
    let g:options = [['tags', oldval, '', oldval, 'tagpath1', 'global', 'setglobal']]
    setglobal tags=tagpath1
    call assert_equal([], g:options)
    call assert_equal(g:opt[0], g:opt[1])
  
!   " 19d: Setting local string local-global (to buffer) option"
    let g:options = [['tags', 'tagpath1', 'tagpath1', '', 'tagpath2', 'local', 'setlocal']]
    setlocal tags=tagpath2
    call assert_equal([], g:options)
    call assert_equal(g:opt[0], g:opt[1])
  
!   " 19e: Setting again string local-global (to buffer) option"
!   " Note: v:option_old is the old global value for local-global string options
    " but the old local value for all other kinds of options.
    noa setglobal tags=tag_global " Reset global and local value (without triggering autocmd)
    noa setlocal tags=tag_local
--- 760,792 ----
    call assert_equal(g:opt[0], g:opt[1])
  
  
!   " 19a: Setting string global-local (to buffer) option"
    let oldval = &tags
    let g:options = [['tags', oldval, oldval, oldval, 'tagpath', 'global', 'set']]
    set tags=tagpath
    call assert_equal([], g:options)
    call assert_equal(g:opt[0], g:opt[1])
  
!   " 19b: Resetting string global-local (to buffer) option"
    let g:options = [['tags', 'tagpath', 'tagpath', 'tagpath', oldval, 'global', 'set']]
    set tags&
    call assert_equal([], g:options)
    call assert_equal(g:opt[0], g:opt[1])
  
!   " 19c: Setting global string global-local (to buffer) option "
    let g:options = [['tags', oldval, '', oldval, 'tagpath1', 'global', 'setglobal']]
    setglobal tags=tagpath1
    call assert_equal([], g:options)
    call assert_equal(g:opt[0], g:opt[1])
  
!   " 19d: Setting local string global-local (to buffer) option"
    let g:options = [['tags', 'tagpath1', 'tagpath1', '', 'tagpath2', 'local', 'setlocal']]
    setlocal tags=tagpath2
    call assert_equal([], g:options)
    call assert_equal(g:opt[0], g:opt[1])
  
!   " 19e: Setting again string global-local (to buffer) option"
!   " Note: v:option_old is the old global value for global-local string options
    " but the old local value for all other kinds of options.
    noa setglobal tags=tag_global " Reset global and local value (without triggering autocmd)
    noa setlocal tags=tag_local
***************
*** 795,802 ****
    call assert_equal([], g:options)
    call assert_equal(g:opt[0], g:opt[1])
  
!   " 19f: Setting string local-global (to buffer) option to an empty string"
!   " Note: v:option_old is the old global value for local-global string options
    " but the old local value for all other kinds of options.
    noa set tags=tag_global " Reset global and local value (without triggering autocmd)
    noa setlocal tags= " empty string
--- 795,802 ----
    call assert_equal([], g:options)
    call assert_equal(g:opt[0], g:opt[1])
  
!   " 19f: Setting string global-local (to buffer) option to an empty string"
!   " Note: v:option_old is the old global value for global-local string options
    " but the old local value for all other kinds of options.
    noa set tags=tag_global " Reset global and local value (without triggering autocmd)
    noa setlocal tags= " empty string
***************
*** 833,839 ****
    call assert_equal(g:opt[0], g:opt[1])
  
    " 20e: Setting again string local (to buffer) option"
!   " Note: v:option_old is the old global value for local-global string options
    " but the old local value for all other kinds of options.
    noa setglobal spelllang=spellglobal " Reset global and local value (without triggering autocmd)
    noa setlocal spelllang=spelllocal
--- 833,839 ----
    call assert_equal(g:opt[0], g:opt[1])
  
    " 20e: Setting again string local (to buffer) option"
!   " Note: v:option_old is the old global value for global-local string options
    " but the old local value for all other kinds of options.
    noa setglobal spelllang=spellglobal " Reset global and local value (without triggering autocmd)
    noa setlocal spelllang=spelllocal
***************
*** 843,878 ****
    call assert_equal(g:opt[0], g:opt[1])
  
  
!   " 21a: Setting string local-global (to window) option"
    let oldval = &statusline
    let g:options = [['statusline', oldval, oldval, oldval, 'foo', 'global', 'set']]
    set statusline=foo
    call assert_equal([], g:options)
    call assert_equal(g:opt[0], g:opt[1])
  
!   " 21b: Resetting string local-global (to window) option"
!   " Note: v:option_old is the old global value for local-global string options
    " but the old local value for all other kinds of options.
    let g:options = [['statusline', 'foo', 'foo', 'foo', oldval, 'global', 'set']]
    set statusline&
    call assert_equal([], g:options)
    call assert_equal(g:opt[0], g:opt[1])
  
!   " 21c: Setting global string local-global (to window) option"
    let g:options = [['statusline', oldval, '', oldval, 'bar', 'global', 'setglobal']]
    setglobal statusline=bar
    call assert_equal([], g:options)
    call assert_equal(g:opt[0], g:opt[1])
  
!   " 21d: Setting local string local-global (to window) option"
    noa set statusline& " Reset global and local value (without triggering autocmd)
    let g:options = [['statusline', oldval, oldval, '', 'baz', 'local', 'setlocal']]
    setlocal statusline=baz
    call assert_equal([], g:options)
    call assert_equal(g:opt[0], g:opt[1])
  
!   " 21e: Setting again string local-global (to window) option"
!   " Note: v:option_old is the old global value for local-global string options
    " but the old local value for all other kinds of options.
    noa setglobal statusline=bar " Reset global and local value (without triggering autocmd)
    noa setlocal statusline=baz
--- 843,878 ----
    call assert_equal(g:opt[0], g:opt[1])
  
  
!   " 21a: Setting string global-local (to window) option"
    let oldval = &statusline
    let g:options = [['statusline', oldval, oldval, oldval, 'foo', 'global', 'set']]
    set statusline=foo
    call assert_equal([], g:options)
    call assert_equal(g:opt[0], g:opt[1])
  
!   " 21b: Resetting string global-local (to window) option"
!   " Note: v:option_old is the old global value for global-local string options
    " but the old local value for all other kinds of options.
    let g:options = [['statusline', 'foo', 'foo', 'foo', oldval, 'global', 'set']]
    set statusline&
    call assert_equal([], g:options)
    call assert_equal(g:opt[0], g:opt[1])
  
!   " 21c: Setting global string global-local (to window) option"
    let g:options = [['statusline', oldval, '', oldval, 'bar', 'global', 'setglobal']]
    setglobal statusline=bar
    call assert_equal([], g:options)
    call assert_equal(g:opt[0], g:opt[1])
  
!   " 21d: Setting local string global-local (to window) option"
    noa set statusline& " Reset global and local value (without triggering autocmd)
    let g:options = [['statusline', oldval, oldval, '', 'baz', 'local', 'setlocal']]
    setlocal statusline=baz
    call assert_equal([], g:options)
    call assert_equal(g:opt[0], g:opt[1])
  
!   " 21e: Setting again string global-local (to window) option"
!   " Note: v:option_old is the old global value for global-local string options
    " but the old local value for all other kinds of options.
    noa setglobal statusline=bar " Reset global and local value (without triggering autocmd)
    noa setlocal statusline=baz
***************
*** 917,923 ****
    call assert_equal(g:opt[0], g:opt[1])
  
  
!   " 23a: Setting global number local option"
    noa setglobal cmdheight=8 " Reset global and local value (without triggering autocmd)
    noa setlocal cmdheight=1 " Sets the global(!) value!
    let g:options = [['cmdheight', '1', '', '1', '2', 'global', 'setglobal']]
--- 917,923 ----
    call assert_equal(g:opt[0], g:opt[1])
  
  
!   " 23a: Setting global number global option"
    noa setglobal cmdheight=8 " Reset global and local value (without triggering autocmd)
    noa setlocal cmdheight=1 " Sets the global(!) value!
    let g:options = [['cmdheight', '1', '', '1', '2', 'global', 'setglobal']]
***************
*** 1041,1047 ****
    call assert_equal([], g:options)
    call assert_equal(g:opt[0], g:opt[1])
  
!   " 27d: Ssettin again global number local (to window) option"
    noa set foldcolumn=8 " Reset global and local value (without triggering autocmd)
    let g:options = [['foldcolumn', '8', '8', '8', '2', 'global', 'set']]
    set foldcolumn=2
--- 1041,1047 ----
    call assert_equal([], g:options)
    call assert_equal(g:opt[0], g:opt[1])
  
!   " 27d: Setting again global number local (to window) option"
    noa set foldcolumn=8 " Reset global and local value (without triggering autocmd)
    let g:options = [['foldcolumn', '8', '8', '8', '2', 'global', 'set']]
    set foldcolumn=2
*** ../vim-8.2.3548/src/version.c	2021-10-20 23:08:07.790623217 +0100
--- src/version.c	2021-10-21 10:49:53.552293269 +0100
***************
*** 759,760 ****
--- 759,762 ----
  {   /* Add new patch number below this line */
+ /**/
+     3549,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
211. Your husband leaves you...taking the computer with him and you
     call him crying, and beg him to bring the computer back.

 /// 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    ///