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

Patch 9.0.0118 (after 9.0.0115)
Problem:    No test for what patch 9.0.0155 fixes.
Solution:   Add a test. Fix typos.  (closes #10822)
Files:      runtime/doc/options.txt, src/globals.h, src/register.c,
            src/testdir/test_ins_complete.vim, src/testdir/test_messages.vim


*** ../vim-9.0.0117/runtime/doc/options.txt	2022-07-30 16:54:01.859698303 +0100
--- runtime/doc/options.txt	2022-07-31 11:31:31.636820191 +0100
***************
*** 6453,6459 ****
  	'cmdheight' is zero, the ruler is not shown.  Otherwise it is shown in
  	the last line of the screen.  If the statusline is given by
  	'statusline' (i.e. not empty), this option takes precedence over
! 	'ruler' and 'rulerformat'
  	If the number of characters displayed is different from the number of
  	bytes in the text (e.g., for a TAB or a multibyte character), both
  	the text column (byte number) and the screen column are shown,
--- 6453,6459 ----
  	'cmdheight' is zero, the ruler is not shown.  Otherwise it is shown in
  	the last line of the screen.  If the statusline is given by
  	'statusline' (i.e. not empty), this option takes precedence over
! 	'ruler' and 'rulerformat'.
  	If the number of characters displayed is different from the number of
  	bytes in the text (e.g., for a TAB or a multibyte character), both
  	the text column (byte number) and the screen column are shown,
*** ../vim-9.0.0117/src/globals.h	2022-07-30 19:10:03.569318597 +0100
--- src/globals.h	2022-07-30 23:16:09.075592044 +0100
***************
*** 1729,1733 ****
  // overrules p_magic.  Otherwise set to OPTION_MAGIC_NOT_SET.
  EXTERN optmagic_T magic_overruled INIT(= OPTION_MAGIC_NOT_SET);
  
! // Set when 'cmdheight' is changed from non-zero to one temporarily.
  EXTERN int made_cmdheight_nonzero INIT(= FALSE);
--- 1729,1733 ----
  // overrules p_magic.  Otherwise set to OPTION_MAGIC_NOT_SET.
  EXTERN optmagic_T magic_overruled INIT(= OPTION_MAGIC_NOT_SET);
  
! // Set when 'cmdheight' is changed from zero to one temporarily.
  EXTERN int made_cmdheight_nonzero INIT(= FALSE);
*** ../vim-9.0.0117/src/register.c	2022-07-30 16:54:01.867698285 +0100
--- src/register.c	2022-07-31 11:31:35.832790771 +0100
***************
*** 389,395 ****
  
  	    if (p_ch < 1)
  	    {
! 		// Enable macro indicator temporary
  		set_option_value((char_u *)"ch", 1L, NULL, 0);
  		update_screen(VALID);
  
--- 389,395 ----
  
  	    if (p_ch < 1)
  	    {
! 		// Enable macro indicator temporarily
  		set_option_value((char_u *)"ch", 1L, NULL, 0);
  		update_screen(VALID);
  
*** ../vim-9.0.0117/src/testdir/test_ins_complete.vim	2022-07-28 21:51:34.336218153 +0100
--- src/testdir/test_ins_complete.vim	2022-07-31 11:31:35.832790771 +0100
***************
*** 397,403 ****
          \ 'user_data': '',
          \ }
    let v:completed_item = value
!   call assert_equal(v:completed_item, value)
  endfunc
  
  func CompleteTest(findstart, query)
--- 397,403 ----
          \ 'user_data': '',
          \ }
    let v:completed_item = value
!   call assert_equal(value, v:completed_item)
  endfunc
  
  func CompleteTest(findstart, query)
*** ../vim-9.0.0117/src/testdir/test_messages.vim	2022-07-30 16:54:01.867698285 +0100
--- src/testdir/test_messages.vim	2022-07-31 11:31:35.832790771 +0100
***************
*** 409,422 ****
  
    " Check change/restore cmdheight when macro
    call feedkeys("qa", "xt")
!   call assert_equal(&cmdheight, 1)
    call feedkeys("q", "xt")
!   call assert_equal(&cmdheight, 0)
  
    call setline(1, 'somestring')
    call feedkeys("y", "n")
    %s/somestring/otherstring/gc
!   call assert_equal(getline(1), 'otherstring')
  
    call feedkeys("g\<C-g>", "xt")
    call assert_match(
--- 409,422 ----
  
    " Check change/restore cmdheight when macro
    call feedkeys("qa", "xt")
!   call assert_equal(1, &cmdheight)
    call feedkeys("q", "xt")
!   call assert_equal(0, &cmdheight)
  
    call setline(1, 'somestring')
    call feedkeys("y", "n")
    %s/somestring/otherstring/gc
!   call assert_equal('otherstring', getline(1))
  
    call feedkeys("g\<C-g>", "xt")
    call assert_match(
***************
*** 428,434 ****
      split
    endfor
    only
!   call assert_equal(&cmdheight, 0)
  
    set cmdheight&
    set showcmd&
--- 428,443 ----
      split
    endfor
    only
!   call assert_equal(0, &cmdheight)
! 
!   " Check that pressing ":" should not scroll a window
!   " Check for what patch 9.0.0115 fixes
!   botright 10new
!   call setline(1, range(12))
!   7
!   call feedkeys(":\"\<C-R>=line('w0')\<CR>\<CR>", "xt")
!   call assert_equal('"1', @:)
!   bwipe!
  
    set cmdheight&
    set showcmd&
*** ../vim-9.0.0117/src/version.c	2022-07-30 22:17:14.812697205 +0100
--- src/version.c	2022-07-31 11:33:07.444205417 +0100
***************
*** 737,738 ****
--- 737,740 ----
  {   /* Add new patch number below this line */
+ /**/
+     118,
  /**/

-- 
$ echo pizza > /dev/oven

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