b594b0e
To: vim-dev@vim.org
b594b0e
Subject: Patch 7.0.099
b594b0e
Fcc: outbox
b594b0e
From: Bram Moolenaar <Bram@moolenaar.net>
b594b0e
Mime-Version: 1.0
b594b0e
Content-Type: text/plain; charset=ISO-8859-1
b594b0e
Content-Transfer-Encoding: 8bit
b594b0e
------------
b594b0e
b594b0e
Patch 7.0.099
b594b0e
Problem:    GUI: When the popup menu is visible using the scrollbar messes up
b594b0e
	    the display.
b594b0e
Solution:   Disallow scrolling the current window.  Redraw the popup menu
b594b0e
	    after scrolling another window.
b594b0e
Files:	    src/gui.c
b594b0e
b594b0e
b594b0e
*** ../vim-7.0.098/src/gui.c	Tue Aug 29 18:16:37 2006
b594b0e
--- src/gui.c	Sun Sep 10 21:28:57 2006
b594b0e
***************
b594b0e
*** 3734,3739 ****
b594b0e
--- 3734,3745 ----
b594b0e
      if (dont_scroll || input_available())
b594b0e
  	return;
b594b0e
  #endif
b594b0e
+ #ifdef FEAT_INS_EXPAND
b594b0e
+     /* Disallow scrolling the current window when the completion popup menu is
b594b0e
+      * visible. */
b594b0e
+     if ((sb->wp == NULL || sb->wp == curwin) && pum_visible())
b594b0e
+ 	return;
b594b0e
+ #endif
b594b0e
  
b594b0e
  #ifdef FEAT_RIGHTLEFT
b594b0e
      if (sb->wp == NULL && curwin->w_p_rl)
b594b0e
***************
b594b0e
*** 4207,4212 ****
b594b0e
--- 4213,4224 ----
b594b0e
  	redraw_win_later(wp, VALID);
b594b0e
  	updateWindow(wp);   /* update window, status line, and cmdline */
b594b0e
      }
b594b0e
+ 
b594b0e
+ #ifdef FEAT_INS_EXPAND
b594b0e
+     /* May need to redraw the popup menu. */
b594b0e
+     if (pum_visible())
b594b0e
+ 	pum_redraw();
b594b0e
+ #endif
b594b0e
  
b594b0e
      return (wp == curwin && !equalpos(curwin->w_cursor, old_cursor));
b594b0e
  }
b594b0e
*** ../vim-7.0.098/src/version.c	Sun Sep 10 21:05:39 2006
b594b0e
--- src/version.c	Sun Sep 10 21:35:27 2006
b594b0e
***************
b594b0e
*** 668,669 ****
b594b0e
--- 668,671 ----
b594b0e
  {   /* Add new patch number below this line */
b594b0e
+ /**/
b594b0e
+     99,
b594b0e
  /**/
b594b0e
b594b0e
-- 
b594b0e
FATHER: We are here today to witness the union of two young people in the
b594b0e
        joyful bond of the holy wedlock.  Unfortunately, one of them, my son
b594b0e
        Herbert, has just fallen to his death.
b594b0e
   [Murmurs from CROWD;  the BRIDE smiles with relief, coughs.]
b594b0e
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
b594b0e
b594b0e
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
b594b0e
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
b594b0e
\\\        download, build and distribute -- http://www.A-A-P.org        ///
b594b0e
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///