To: vim_dev@googlegroups.com
Subject: Patch 8.2.3465
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.3465
Problem:    Cannot detect insert scroll mode.
Solution:   Add "scroll" to complete_info(). (closes #8943)
Files:      runtime/doc/eval.txt, src/insexpand.c, src/testdir/test_popup.vim


*** ../vim-8.2.3464/runtime/doc/eval.txt	2021-10-02 16:34:51.110830402 +0100
--- runtime/doc/eval.txt	2021-10-03 11:58:14.384050141 +0100
***************
*** 3859,3864 ****
--- 3883,3890 ----
  		   ""		     Not in completion mode
  		   "keyword"	     Keyword completion |i_CTRL-X_CTRL-N|
  		   "ctrl_x"	     Just pressed CTRL-X |i_CTRL-X|
+ 		   "scroll"	     Scrolling with |i_CTRL-X_CTRL-E| or
+ 				     |i_CTRL-X_CTRL-Y|
  		   "whole_line"	     Whole lines |i_CTRL-X_CTRL-L|
  		   "files"	     File names |i_CTRL-X_CTRL-F|
  		   "tags"	     Tags |i_CTRL-X_CTRL-]|
*** ../vim-8.2.3464/src/insexpand.c	2021-08-31 18:12:47.757554157 +0100
--- src/insexpand.c	2021-10-03 11:55:43.192583267 +0100
***************
*** 68,74 ****
  static char *ctrl_x_mode_names[] = {
  	"keyword",
  	"ctrl_x",
! 	"unknown",	    // CTRL_X_SCROLL
  	"whole_line",
  	"files",
  	"tags",
--- 68,74 ----
  static char *ctrl_x_mode_names[] = {
  	"keyword",
  	"ctrl_x",
! 	"scroll",
  	"whole_line",
  	"files",
  	"tags",
***************
*** 2539,2545 ****
      static char_u *
  ins_compl_mode(void)
  {
!     if (ctrl_x_mode == CTRL_X_NOT_DEFINED_YET || compl_started)
  	return (char_u *)ctrl_x_mode_names[ctrl_x_mode & ~CTRL_X_WANT_IDENT];
  
      return (char_u *)"";
--- 2539,2546 ----
      static char_u *
  ins_compl_mode(void)
  {
!     if (ctrl_x_mode == CTRL_X_NOT_DEFINED_YET || ctrl_x_mode == CTRL_X_SCROLL
! 	    || compl_started)
  	return (char_u *)ctrl_x_mode_names[ctrl_x_mode & ~CTRL_X_WANT_IDENT];
  
      return (char_u *)"";
*** ../vim-8.2.3464/src/testdir/test_popup.vim	2021-06-04 20:09:51.725329002 +0100
--- src/testdir/test_popup.vim	2021-10-03 11:55:43.192583267 +0100
***************
*** 990,995 ****
--- 990,999 ----
          \ ["\<C-X>", 'ctrl_x'],
          \ ["\<C-X>\<C-N>", 'keyword'],
          \ ["\<C-X>\<C-P>", 'keyword'],
+         \ ["\<C-X>\<C-E>", 'scroll'],
+         \ ["\<C-X>\<C-Y>", 'scroll'],
+         \ ["\<C-X>\<C-E>\<C-E>\<C-Y>", 'scroll'],
+         \ ["\<C-X>\<C-Y>\<C-E>\<C-Y>", 'scroll'],
          \ ["\<C-X>\<C-L>", 'whole_line'],
          \ ["\<C-X>\<C-F>", 'files'],
          \ ["\<C-X>\<C-]>", 'tags'],
*** ../vim-8.2.3464/src/version.c	2021-10-03 11:46:02.575517682 +0100
--- src/version.c	2021-10-03 11:58:26.992428737 +0100
***************
*** 759,760 ****
--- 759,762 ----
  {   /* Add new patch number below this line */
+ /**/
+     3465,
  /**/

-- 
From "know your smileys":
 :-&	Eating spaghetti

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